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 0001/1031] 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 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 0002/1031] 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 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 0003/1031] 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 0004/1031] 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 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 0005/1031] 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 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 0006/1031] 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 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 0007/1031] 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 0008/1031] 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 0009/1031] 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 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 0010/1031] 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 6095a00703cd320281a432d65b80eca9027167a9 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 8 Apr 2020 13:52:46 +0100
Subject: [PATCH 0011/1031] 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 0012/1031] 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 0013/1031] 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 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 0014/1031] 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 0015/1031] 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 0016/1031] 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 0017/1031] 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 0018/1031] 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 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 0019/1031] 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 0020/1031] 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 0021/1031] 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 0022/1031] 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 0023/1031] 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 0024/1031] 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 0025/1031] 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 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 0026/1031] 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 0027/1031] 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 0028/1031] 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 0029/1031] 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 0030/1031] 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 0031/1031] 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 0032/1031] 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 0033/1031] 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 0034/1031] 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 0035/1031] 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 0036/1031] 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 0037/1031] 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 0038/1031] 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 0039/1031] 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 0040/1031] 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 0041/1031] 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 0042/1031] 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 0043/1031] 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 0044/1031] 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 0045/1031] 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 0046/1031] 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 0047/1031] 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 0048/1031] 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 0049/1031] 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 0050/1031] 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 0051/1031] 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 0052/1031] 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 0053/1031] 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 0054/1031] 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 882aefb94c2d027e848836219d26ca0222bceac5 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Sat, 11 Apr 2020 08:51:07 +0000
Subject: [PATCH 0055/1031] 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 0056/1031] 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 0057/1031] 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 0058/1031] 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 0059/1031] 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 0060/1031] 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 0061/1031] 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 0062/1031] 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 0063/1031] 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 0064/1031] 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 0065/1031] 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 0066/1031] @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 0067/1031] 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 0068/1031] 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 0069/1031] 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 0070/1031] 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 0071/1031] 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 0072/1031] 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 0073/1031] 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 0074/1031] 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 0075/1031] 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 0076/1031] 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 0077/1031] 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 0078/1031] 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 0079/1031] 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 0080/1031] 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 0081/1031] 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 0082/1031] 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 0083/1031] 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 0084/1031] 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 0085/1031] 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 0086/1031] 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 0087/1031] 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 0088/1031] 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 0089/1031] 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 0090/1031] 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 0091/1031] 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 0092/1031] 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 0093/1031] 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 0094/1031] 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 0095/1031] 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 0096/1031] 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 0097/1031] 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 0098/1031] 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 0099/1031] 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 0100/1031] 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 0101/1031] 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 0102/1031] 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 0103/1031] 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 0104/1031] 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 0105/1031] 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 0106/1031] 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 0107/1031] 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 0108/1031] 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 0109/1031] 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 0110/1031] 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 0111/1031] 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 0112/1031] 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 0113/1031] 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 0114/1031] 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 0115/1031] 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 0116/1031] 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 0117/1031] 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 0118/1031] 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 0119/1031] 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 0120/1031] 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 0121/1031] 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 0122/1031] 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 0123/1031] 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 0124/1031] 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 0125/1031] 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 0126/1031] 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 0127/1031] 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 0128/1031] 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 0129/1031] 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 0130/1031] 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 0131/1031] 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 0132/1031] 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 0133/1031] 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 0134/1031] 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 0135/1031] 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 0136/1031] 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 0137/1031] 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 0138/1031] 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 0139/1031] 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 0140/1031] 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 0141/1031] 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 0142/1031] 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 0143/1031] 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 0144/1031] 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 0145/1031] 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 0146/1031] 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 0147/1031] 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 0148/1031] 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 0149/1031] 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 0150/1031] 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 0151/1031] 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 0152/1031] 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 0153/1031] 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 0154/1031] 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 0155/1031] 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 0156/1031] 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 0157/1031] 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 0158/1031] 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 0159/1031] 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 0160/1031] 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 0161/1031] 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 0162/1031] 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 0163/1031] 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 0164/1031] 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 0165/1031] 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 0166/1031] 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 0167/1031] 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 0168/1031] 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 0169/1031] 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 0170/1031] 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 0171/1031] 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 0172/1031] 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 0173/1031] 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 0174/1031] 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 0175/1031] 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 0176/1031] 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 0177/1031] 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 0178/1031] 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 0179/1031] 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 0180/1031] 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 0181/1031] 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 0182/1031] 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 0183/1031] 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 0184/1031] 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 0185/1031] 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 0186/1031] 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 0187/1031] 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 0188/1031] 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 0189/1031] 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 0190/1031] 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 0191/1031] 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 0192/1031] 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 0193/1031] 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 0194/1031] 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 0195/1031] 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 0196/1031] 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 0197/1031] 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 0198/1031] 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 0199/1031] 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 0200/1031] 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 0201/1031] 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 0202/1031] 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 0203/1031] 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 0204/1031] 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 0205/1031] 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 0206/1031] 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 0207/1031] 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 0208/1031] =?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 0209/1031] 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 0210/1031] 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 0211/1031] 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 0212/1031] 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 0213/1031] 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 0214/1031] 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 0215/1031] 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 0216/1031] 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 0217/1031] 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 0218/1031] 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 0219/1031] 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 0220/1031] 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 0221/1031] 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 0222/1031] 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 0223/1031] 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 0224/1031] 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 0225/1031] 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 0226/1031] 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 0227/1031] 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 0228/1031] 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 0229/1031] 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 0230/1031] 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 0231/1031] 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 0232/1031] 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 0233/1031] 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 0234/1031] 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 0235/1031] 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 0236/1031] 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 0237/1031] 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 0238/1031] 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 0239/1031] 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 0240/1031] 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 0241/1031] 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 0242/1031] 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 0243/1031] 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 0244/1031] 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 0245/1031] 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 0246/1031] 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 0247/1031] 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 0248/1031] 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 0249/1031] 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 0250/1031] 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 0251/1031] 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 0252/1031] 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 0253/1031] 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 0254/1031] 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 0255/1031] 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 0256/1031] 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 0257/1031] 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 0258/1031] 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 0259/1031] 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 0260/1031] 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 0261/1031] 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 0262/1031] 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 0263/1031] 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 0264/1031] 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 0265/1031] 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 0266/1031] 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 0267/1031] 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 0268/1031] 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 0269/1031] 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 0270/1031] 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 0271/1031] 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 0272/1031] 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 0273/1031] 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 0274/1031] 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 0275/1031] 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 0276/1031] 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 0277/1031] 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 0278/1031] 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 0279/1031] 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 0280/1031] 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 0281/1031] 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 0282/1031] 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 0283/1031] 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 0284/1031] 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 0285/1031] 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 0286/1031] 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 0287/1031] 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 0288/1031] 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 0289/1031] 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 0290/1031] 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 0291/1031] 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 0292/1031] 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 0293/1031] 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 0294/1031] 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 0295/1031] 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 0296/1031] 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 0297/1031] 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 0298/1031] 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 0299/1031] 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 0300/1031] 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 0301/1031] 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 0302/1031] 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 0303/1031] 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 0304/1031] 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 0305/1031] 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 0306/1031] 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 0307/1031] 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 0308/1031] 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 0309/1031] 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 0310/1031] 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 0311/1031] 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 0312/1031] 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 0313/1031] 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 0314/1031] 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 0315/1031] 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 0316/1031] 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 0317/1031] 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 0318/1031] 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 0319/1031] 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 0320/1031] 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 0321/1031] 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 0322/1031] 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 0323/1031] 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 0324/1031] 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 0325/1031] 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 0326/1031] 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 0327/1031] 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 0328/1031] 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 0329/1031] 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 0330/1031] 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 0331/1031] 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 0332/1031] 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 0333/1031] 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 0334/1031] 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 0335/1031] 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 0336/1031] 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 0337/1031] 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 0338/1031] 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 0339/1031] 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 0340/1031] 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 0341/1031] 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 0342/1031] 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 0343/1031] 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 0344/1031] 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 0345/1031] 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 0346/1031] 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 0347/1031] 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 0348/1031] 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 0349/1031] 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 0350/1031] 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 0351/1031] 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 0352/1031] 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 0353/1031] 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 0354/1031] 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 0355/1031] 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 0356/1031] 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 0357/1031] 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 0358/1031] 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 0359/1031] 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 0360/1031] 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 0361/1031] 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 0362/1031] 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 0363/1031] 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 0364/1031] 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 0365/1031] 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 0366/1031] 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 0367/1031] 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 0368/1031] 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 0369/1031] 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 0370/1031] 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 0371/1031] 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 0372/1031] 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 0373/1031] 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 0374/1031] 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 0375/1031] 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 0376/1031] 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 0377/1031] 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 0378/1031] 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 0379/1031] 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 0380/1031] 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 0381/1031] 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 0382/1031] 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 0383/1031] 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 0384/1031] 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 0385/1031] 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 0386/1031] 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 0387/1031] 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 0388/1031] 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 0389/1031] 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 0390/1031] 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 0391/1031] 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 0392/1031] 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 0393/1031] =?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 0394/1031] 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 0395/1031] 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 0396/1031] 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 0397/1031] 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 0398/1031] 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 0399/1031] 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 0400/1031] 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 0401/1031] 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 0402/1031] 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 0403/1031] 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 0404/1031] 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 0405/1031] 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 0406/1031] 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 0407/1031] 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 0408/1031] 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 0409/1031] 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 0410/1031] 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 0411/1031] 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 0412/1031] 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 0413/1031] 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 0414/1031] 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 0415/1031] 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 0416/1031] 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 0417/1031] 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 0418/1031] 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 0419/1031] 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 0420/1031] 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 0421/1031] 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 0422/1031] 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 0423/1031] 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 0424/1031] 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 0425/1031] 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 0426/1031] 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 0427/1031] 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 0428/1031] 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 0429/1031] 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 0430/1031] 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 0431/1031] 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 0432/1031] 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 0433/1031] 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 0434/1031] 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 0435/1031] 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 0436/1031] 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 0437/1031] 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 0438/1031] 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 0439/1031] 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 0440/1031] 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 0441/1031] 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 0442/1031] 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 0443/1031] 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 0444/1031] 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 0445/1031] 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 0446/1031] 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 0447/1031] 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 0448/1031] 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 0449/1031] 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 0450/1031] 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 0451/1031] 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 0452/1031] 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 0453/1031] 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 0454/1031] 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 0455/1031] 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 0456/1031] 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 0457/1031] 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 0458/1031] 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 0459/1031] 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 0460/1031] 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 0461/1031] 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 0462/1031] 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 0463/1031] 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 0464/1031] 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 0465/1031] 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 0466/1031] 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 0467/1031] 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 0468/1031] 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 0469/1031] 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 0470/1031] 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 0471/1031] 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 0472/1031] 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 0473/1031] 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 0474/1031] 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 0475/1031] 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 0476/1031] 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 0477/1031] 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 0478/1031] 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 0479/1031] 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 0480/1031] 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 0481/1031] 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 0482/1031] 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 0483/1031] 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 0484/1031] 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 0485/1031] 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 0486/1031] 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 0487/1031] 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 0488/1031] 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 0489/1031] 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 0490/1031] 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 0491/1031] 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 0492/1031] 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 0493/1031] 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 0494/1031] 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 0495/1031] 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 0496/1031] 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 0497/1031] 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 0498/1031] 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 0499/1031] 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 0500/1031] 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 0501/1031] 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 0502/1031] 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 0503/1031] 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 0504/1031] 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 0505/1031] 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 0506/1031] 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 0507/1031] 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 0508/1031] 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 0509/1031] 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 0510/1031] 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 0511/1031] 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 0512/1031] 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 0513/1031] 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 0514/1031] 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 0515/1031] 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 0516/1031] 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 0517/1031] 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 0518/1031] 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 0519/1031] 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 0520/1031] 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 0521/1031] 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 0522/1031] 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 0523/1031] 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 0524/1031] 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 0525/1031] 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 0526/1031] 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 0527/1031] 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 0528/1031] 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 0529/1031] 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 0530/1031] 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 0531/1031] 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 0532/1031] 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 0533/1031] 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 0534/1031] 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 0535/1031] 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 0536/1031] 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 0537/1031] 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 0538/1031] 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 0539/1031] 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 0540/1031] 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 0541/1031] 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 0542/1031] 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 0543/1031] 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 0544/1031] 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 0545/1031] 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 0546/1031] 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 0547/1031] 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 0548/1031] 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 0549/1031] 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 0550/1031] 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 0551/1031] 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 0552/1031] 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 0553/1031] 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 0554/1031] 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 0555/1031] 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 0556/1031] 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 0557/1031] 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 0558/1031] 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 0559/1031] 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 0560/1031] 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 0561/1031] 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 0562/1031] 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 0563/1031] 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 0564/1031] 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 0565/1031] 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 0566/1031] 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 0567/1031] 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 0568/1031] 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 0569/1031] 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 0570/1031] 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 0571/1031] 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 0572/1031] 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 0573/1031] 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 0574/1031] 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 0575/1031] 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 0576/1031] 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 0577/1031] 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 0578/1031] 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 0579/1031] 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 0580/1031] 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 0581/1031] 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 0582/1031] 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 0583/1031] 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 0584/1031] 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 0585/1031] 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 0586/1031] 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 0587/1031] 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 0588/1031] 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 0589/1031] 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 0590/1031] 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 0591/1031] 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 0592/1031] 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 0593/1031] 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 0594/1031] 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 0595/1031] 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 0596/1031] 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 0597/1031] 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 0598/1031] 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 0599/1031] 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 0600/1031] 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 0601/1031] 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 0602/1031] 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 0603/1031] 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 0604/1031] 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 0605/1031] 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 0606/1031] 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 0607/1031] 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 0608/1031] 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 0609/1031] 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 0610/1031] 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 0611/1031] 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 0612/1031] 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 0613/1031] 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 0614/1031] 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 0615/1031] 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 0616/1031] 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 0617/1031] 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 0618/1031] 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 0619/1031] 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 0620/1031] 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 0621/1031] 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 0622/1031] 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 0623/1031] 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 0624/1031] 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 0625/1031] 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 0626/1031] 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 0627/1031] 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 0628/1031] 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 0629/1031] 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 0630/1031] 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 0631/1031] 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 0632/1031] 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 0633/1031] 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 0634/1031] 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 0635/1031] 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 0636/1031] 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 0637/1031] 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 0638/1031] 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 0639/1031] 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 0640/1031] 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 0641/1031] 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 0642/1031] 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 0643/1031] 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 0644/1031] 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 0645/1031] 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 0646/1031] 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 0647/1031] 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 0648/1031] 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 0649/1031] 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 0650/1031] 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 0651/1031] 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 0652/1031] 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 0653/1031] 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 0654/1031] 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 0655/1031] 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 0656/1031] 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 0657/1031] 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 0658/1031] 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 0659/1031] 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 0660/1031] 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 0661/1031] 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 0662/1031] 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 0663/1031] 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 0664/1031] 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 0665/1031] 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 0666/1031] 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 0667/1031] 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 0668/1031] 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 0669/1031] 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 0670/1031] =?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 0671/1031] 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 0672/1031] 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 0673/1031] 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 0674/1031] 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 0675/1031] 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 0676/1031] 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 0677/1031] 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 0678/1031] 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 0679/1031] 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 0680/1031] 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 0681/1031] 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 0682/1031] 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 0683/1031] 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 0684/1031] 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 0685/1031] 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 0686/1031] 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 0687/1031] 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 0688/1031] 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 0689/1031] 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 0690/1031] 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 0691/1031] 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 0692/1031] 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 0693/1031] 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 0694/1031] =?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 0695/1031] 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 0696/1031] 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 0697/1031] 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 0698/1031] 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 0699/1031] 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 0700/1031] 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 0701/1031] 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 0702/1031] 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 0703/1031] 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 0704/1031] 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 0705/1031] 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 0706/1031] 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 0707/1031] 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 0708/1031] 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 0709/1031] 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 0710/1031] 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 0711/1031] 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 0712/1031] 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 0713/1031] 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 0714/1031] 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 0715/1031] 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 0716/1031] 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 0717/1031] 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 0718/1031] 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 0719/1031] 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 0720/1031] 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 0721/1031] 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 0722/1031] 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 0723/1031] 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 0724/1031] 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 0725/1031] 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 0726/1031] 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 0727/1031] 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 0728/1031] 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 0729/1031] 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 0730/1031] 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 0731/1031] 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 0732/1031] 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 0733/1031] 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 0734/1031] 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 0735/1031] 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 0736/1031] 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 0737/1031] 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 0738/1031] 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 0739/1031] 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 0740/1031] 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 0741/1031] 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 0742/1031] 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 0743/1031] 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 0744/1031] 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 0745/1031] 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 0746/1031] 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 0747/1031] 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 0748/1031] 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 0749/1031] 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 0750/1031] 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 0751/1031] 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 0752/1031] 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 0753/1031] 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 0754/1031] 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 0755/1031] 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 0756/1031] 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 0757/1031] 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 0758/1031] 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 0759/1031] 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 0760/1031] 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 0761/1031] 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 0762/1031] 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 0763/1031] 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 0764/1031] 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 0765/1031] 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 0766/1031] 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 0767/1031] 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 0768/1031] 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 0769/1031] 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 0770/1031] 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 0771/1031] 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 0772/1031] 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 0773/1031] 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 0774/1031] 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 0775/1031] 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 0776/1031] 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 0777/1031] 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 0778/1031] 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 0779/1031] 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 0780/1031] 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 0781/1031] 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 0782/1031] 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 0783/1031] 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 0784/1031] 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 0785/1031] 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 0786/1031] 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 0787/1031] 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 0788/1031] 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 0789/1031] 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 0790/1031] 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 0791/1031] 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 0792/1031] 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 0793/1031] 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 0794/1031] 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 0795/1031] 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 0796/1031] 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 0797/1031] 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 0798/1031] 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 0799/1031] 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 0800/1031] 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 0801/1031] 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 0802/1031] 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 0803/1031] 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 0804/1031] 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 0805/1031] 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 0806/1031] 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 0807/1031] 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 0808/1031] 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 0809/1031] 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 0810/1031] 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 0811/1031] 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 0812/1031] 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 0813/1031] 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 0814/1031] 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 0815/1031] 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 0816/1031] 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 0817/1031] 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 0818/1031] 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 0819/1031] 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 0820/1031] 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 0821/1031] 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 0822/1031] 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 0823/1031] 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 0824/1031] 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 0825/1031] 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 0826/1031] 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 0827/1031] 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 0828/1031] 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 0829/1031] 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 0830/1031] 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 0831/1031] 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 0832/1031] 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 0833/1031] 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 0834/1031] 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 0835/1031] 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 0836/1031] 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 0837/1031] 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 0838/1031] 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 0839/1031] 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 0840/1031] 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 0841/1031] 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 0842/1031] 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 0843/1031] 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 0844/1031] 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 0845/1031] 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 0846/1031] 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 0847/1031] 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 0848/1031] 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 0849/1031] 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 0850/1031] 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 0851/1031] 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 0852/1031] 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 0853/1031] 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 0854/1031] 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 0855/1031] 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 0856/1031] 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 0857/1031] 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
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
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
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
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
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
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
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
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
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
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
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

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
zcmZ{mcQo5wAHaVh5~GL}tvy<!F``C@QYtlC`!Q<Mq!g`DqehFM)}xeGwMOmns8Lmf
z+N#rP5d<Yw8d3WpR(R9r{p&sFc|YfT@8_=X_uO;uKR4OZ+=!E1h#dd`P7`B{HNzUe
z0|sHV(_>A~83KFho9P2UeLBaX2Mc2?fi<=^1Aqt_0EmePfPKbP3<Ur}kN`k+2LSX_
z01ynwYqdJhSb$u+VuWFs!JfgJXolDVj2(g)cK;{VeJ>6%I?!MfvrAAii-@4AoUqNk
zHO96Y6O6u17-=OZJV3w}p4d4>f1+?2R;-|Z8pMO?6?!XCj09iLAh?scC^nK3#ULYG
zSB4c^(g$RcrD{xU90!c&X)#0^7RxIo89T^od^$tXgYAk$_(!MxesOvZG^u3aahs8C
z^zrnap>|rH+w91_gPmoF@V}C~UR*6+_775II4;QB`X3(OcAkEi_Ztzv@So(eG<0F6
zv<M5evXu7*Mi$M)cjk&K<Rh}_WF+3N^vibJ#(n;JPMcbyi!Z0Ct$$TEzT|EnSC^So
zvYylfZ!jTXo{OfRD2MnB$Czj*X~h4&yE_n@03ob@XKp&Bor>*}AZ4&mBa}>-?WnHp
zto-QxvO`WnWgBXay%dBPYpw#W4sdmVAl~h-!CkB}rYs?qg=wsko4lT8!w&3n;P1v2
z!boG`(h!I)>yA@$w$wy+L*UzTV!*nk-`2K4x4Ke<b1?0p_L}LC=@6Vy?(hyjtC;Wv
z5gG138~MB-k&rg{v#+j0&M%%PoK0A%q6{8pRQAFzU{P=HSITosHQJb9Ljenorry%H
z7JFVyTh~*2v=rr>Im~LV{Jhz-n<*)3-o|wA$3yL*8BR})Tc8jF(Rooe%OiL5ec1uM
znLp@;W`dPdrylXBpZIEM@hNIU88+UwG$FGmNU5wV?$MFY?ji-p=R1dA`3C1vX%Z@v
zdbd>`Zf4%O^XxKiF9OJ*?dL4ie&=-BtQDMer5V2`N5h|yRaWf0Cu^dJnxE4b##69;
zoJ*|Ag8mR`uMiDZ7_g7b$&jdnwnD{#?bgZZrkj>MdYr8lx!buHQjg|sLxw5hqKoA_
z!0d|(d%LoWbD<47!&3^1Z^qUZuP+i-o1H1YYc>YwjR;6$%zIwX)p}^>et>R2UL>Yk
zHbh341*J2?Ly*fXzV}eX8I}myq1?v&Lht&W`c-@^xqC;&b27NXyLn$gLH)fVyG%bl
zVQKv0gA?yKshSmti%EI$^ezw=;6liMK3DKP@*PTJ^q2Rwzfb&1_!v2`pP4SVv8ZS2
zbC|N59MG0Y!wLOpQk@FQeYUWHEuWz_;~KU6Hc|SW56n8@N7-?Kap=LN6quBZ$E!(-
z&k5Esn(R$S!e01Q?E@a#%d483Kc@MjBRN*tm6A~dTb-xn*YA-Yw~cRhhn2hcWq&4j
z2oyTrzl=>~9CzmLG_BRzIe}0dVd?h;(B)lt3?@*bs;AAq8jO+7bjaRqPN`m<@$Jb+
zV2J!oNjLfFjRflq3x3RyfWu7B>$)k9)efm}6cW*dH+DVSaE%W`%z7I7qCj1Vd*r_l
z#i*H``zJ~?qoGE8NTVsnbX)rn6&G3DySB?~ZNWvKFKL{6)|L?xgDuJ_S{inTE7gG0
zo`1;?+<2&od^vrUsY;Ok5#R!tw)bBW>rb9FqHq&PdL@*YAvyd+ce(iSBhOt*e-WvK
zxr_c3TQq<4kV{~cM;_CknUwD6qd#C{W)rv7f3NEHU@(ifA5oY;@bXH0Ldk}_#1XEG
zuQJAyHte>-B+o1qYs!>a=m4jW-GN09|H|IY)2i*xE*Ec+IVszliVZY3va~OSX|V<I
zUgG~CIr(v1vO%aWv~s)fo-a|*Pnw7lylpYJekXQc_e3L~uG=R*ya=T}&8bRTKi%_n
z<toI@lzh~Mt~?e^IGbQ`r{qApr-yeW-433*l}9Sl<>=F?kgi00XFbsAm-Q-h#PHH<
z=+7j#ii)+4pB+E_Q1uOvnxp(x12d@xXPtf3%ppy^^e1i`YJb7EhC9olW$qLIWbWIC
z5q=qOd4of+!xm{Ds!SVZi+Z#o7r8H3q?h%66_ANK64O9fURPu9JvD-vxrjnWt((z)
zCWu8JmTXt3iJF6(zd7b?sCh|tC_8-OsQ4MgJui9G5V1r;yWhIiG&yoCr`P`Cn#PSj
zO9A^JoktQK;#Wo^170<d7f<AUkQVQ9E8-@aGdT?`Pfe`llHH)B+hewzptCr{eUGQv
zk@zb!2E9@DT`+x3DNcy}B!xGUEtM;<jJ&%(*jJb*TmfE0T1tNu*trDrO`Lt7CnH^h
zkf;q$Iy{Qoad|x;6_*~YS?+?^Ji0qBo2HP#Ee5nZ;zA(=!xV*;<&HN|HO7N>W$#US
z9YV32)lK6mHr2IBbvJ}oOSm^0?4SN5b4sJGyB+bF9G%|CWZg#%stiUI>V)r7dynJO
zJ{o9nhsLPFgoT$u+nGnzu7FV!yd~uV)G+IF5jZJ&qCx8&^Ydgj;pi|ipKqb9^cRKm
zLDawOe98TDm1K3l8!fF%lb%k6fp1=0<#Xu!FpV%p0|l=6ZjU%g^TMi|zD28RCeTMa
z1`=ba_cUe8KWwt9+77pRMxQ9Z4wJK?e-ZXtqdb26gdFzDf(ad$3Yvtrf@(WsT^Ec~
z9JpU8BGr&w6KTStqsCs`Mi68F66YX&ThmYAh;AZCF|!S#*^pPmrsp_Qdw1Lx*1SA-
zUYBLzEA^DD9`RuFa2da|i_{Al6I`k@koe|iH3DT43VR=$!(4SH;G|r~;mG$KC&$*h
zz2mU?YSCf8KO@m6*rpN_9o@zADZn`^-ZJ^!h=Yo~R=kj*#)6*wFo28AZp|w6WFDEb
zvF^9Rg4CRgXFrO->ZnEvHZ3K7>t=})caLWry^ww^hImKFWvB*og<b~@TN+0ylp$dC
z3#!hRxPrL01hhf2Up%H1YuV|CRz0`}fupSB1^M;Bk3V>;vtvjW!YnU&CgNIT<SZ*D
zOTZt9RRkf&8q%pcQE0(!-5bH+@pn|ybCO!O?zHW&gu#9LF!-~o=q;X?xf(wc?GEBD
z)IQ331;u4Z2vX5}PqbPnh+OeC-u7P}{#Q%s*8SI~(Nk{%pdoWFxclP>2Y)wEB`Bu`
zHTdy$q5=G)qM1hW$Ok8<V+wT0x)0srw|abjoYy?IX6g<ayc7w1S`Y%KnstHJ{cZhC
zK*mjNT`GmJB#=+6I1{TnSvUST5uxnC5hkL1<6t-Ebmc&b&l&$-F|W113`O%cXLpob
z^wZheFivy&h428wuTC{?Ls{7`=hZNJ?Es-WfI6VX`YkykQvtGe%c^fv<s@@spa=+Z
zP3cg!KhPd+@7g0aZ;<Ei%psCcSwFUy8e`{n7?~D&k~&tiR8}6hHnr)osdA$Zcz}2L
zo>Xd2?}Q(Go<)F{wG^h&H~)<&<|B@`KFyew_K_9FU+zrsrK`a>kKpTQ?Ct9e0q2k^
zC`F{Y;yF#5bE;@{6|@=>fmA^wkzqXxI{%Y!%OB_M8UFth*a}?mj0C{sk~yaKqI>Lr
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
zcmZ{lc|6mPAICpq#@w;wTp~viW6mKrQzQ{1#}HCsj#6W6gh*MaM2<X!@)a`6QB01M
ziBjaAb2eXRCAZ&xzkhz;{`kHh@Av!pJ|3_4zwgwuXKaP|rTGB>5VAvCo#RmNzaa|Y
z<k4@`0uI1I<__inP?I6B<IBV8<^9p;8~^~X3;@Ji0I<aw5$6Hm8Ug^=SO7rf0Kg&K
zlSU_F&I00h+SZCgj%`{t#d83~q1_`n#QrZ<u2}SP3f?F?2W#F*9@#@kRT&q;GDnzV
zXJzhkV|Z~m2In#>^?r3Z=F?JOE%^Z?4VI}?F>1m6obP^#qD5t<#4|Y~7$}&PKC3Nx
z3aO3JEy?+wojX}9B=IqapCTH%i0-<GQdreaODL+dc^8tEgNE9D_q-lC6!~ey6m5^X
zlOOI86dg3)>%+`9iCiCI{$4WNZmum-O)LJtA2_ll5___+mzkygh3A+)^B4ZDca<o0
z<<K1c`HQruo2N_*m)lc^YI!?7N(9a|%O1p}JCQmh|HR0CTxu0&|BJWZ5mIWpza+T}
zAxk8sg27xM41xKpzfY8Cr2vvaab4<g)I8f}y+hpCc~dU2OJaTR0}_=J<U7;I7@@0y
z2m6T^h)2m4CDl~!*@(<H{ImczDam4Rj;JaDs)1dy?BknR6AUsNK(~wn^Xct8l9HJF
zdwo9Yx!g@!gF-LGz^-IVRF|B|YAG+e_SJTRlw!OPc5rH#q-Qcz!0&ggX^8(7y<YdH
zJ~^Osrr-debNd0{(Yykv$wpsc(S*GjmVj6|S0Z(>*zPApFWITy?2U%Egsu6#h2b#S
zq^Yx{$T>(3;qqLuQ%eeC)9m3*K8+x%V5Jen?FYLmcFS>o>`R_6J+WqQHQuo&A=@xj
z1m8%zwoDErfL#LeukN}D8;5o;pxpVU{C1r3#Ai$*-g@%stUF|@io-D~Ctx;>>Y~%(
z(~yut)l#TE{pbR;tK324UU`BMvVUE$3eXOFvhTY5SxK{rvDp*!I_wH>P5NEI#JarD
ziH9Tnr-R1N=U&jm?P3XomlY4wvR$uFY+vQ-&h*+ayZ*%@rlbk*<PH=OY~z;sC>CN@
zQUQj-#b|WPG-+V<X#sD(DKz`>8Ab>r8b|ONYi0)>QPEM{F54_R2u@tfD4KZQ;@>2w
zmfuh5sKo6yY;6|40emhnZz}2Xq7Lz%qWb|g=)+ur@W;a<Kv$+X>FL-011t@od0#e}
zXRg_CX{k|^bsVG#4+Vw1vhqw?Z<zZ~z>m|2u>Us49YxuC;cNL}>tIZ;#qY`cSz%rv
z8Kx$DAfIo|`mN5AJ0|kQd`y5Nv5DGH9xQk@An3zd1H+iPVeQFBIUVT6kgV?xz<VCS
z96o(4gqVRJRu}^V10wKSJg)c03MlVoSkfeePHpM-FbdQI`4h4mV{};_`FU^H<lBmC
ztI^0vY1<z1(RFtf#!KhsvI$e}<}y6|xjkqSsqxVcx4Xeo{0%3qIfN&TU&L&5N9*gq
zfx4eq5{`z*#*el9c=nrCle#VbM81&n$vv26rGD~Glz3>4(Y%3rb-SJ#s@Zq-1`BfP
zyV6?gi@u5ZArb0feeab=tsy*8o%2f7$}5YeZid(?b;9z46k6^;y#~vqum7%Gr#EJg
z_Scs|@1!sje>LexJl<~XB-=Z*hx<#c<l`Io$ME^b;9(6l^FrZR?BYXSVrXovG)wuG
zfPgy1-l_wc9-1j73?pj<5~-Ni?_(Gb$`*DXAQ@+0x6H(X+83oZi|I+Fmeh}*ITr?p
zMs|=4rowskTjS0jB6gJc8tCt5qOpY8)!eeB<dncVdq=!zXTXBEC$Bsu*|r^4<Y}xP
z2R0~YdX(e=t1E0qI0mb5Do$x_=<aL<{b5!mfngBl6IzvQ*}cbB?MY(LT@0xb$uVQ`
zjg|bvw%2k=8MKqFbxav4?84WH>cvDeyTwn8<C2X%b@a#FZfxmS>`$#e@a?0UJ#A+%
z)wX1h0$vl3;L~~Xm!HF~kUo26q<Lk484MZ%Kj>>m;kpeIzHMsenDqV9Ur9U6ll3Og
z4$#y39c%!+(DZ6Xp1J1NrNPmnN2zTdx?L&_juNB*6^A`;`s^G`O>U}mIBo%#=vrpV
zmf{){uyURUiC!>Nr2=slXfqq;J43vFd}VX;FF%}6j*9Yazxm+lrl&TD@z+E3V0>_F
z)(^>QC5@i@d^V}OzPllaTG>*9ZkN+~);-0d<uuLcIWyJXJ+;Y{rHpnFOJ@?Z1Lh=1
z!S>mIg?!We+s9c>E_$>EYhKdb2(4U(obN`1`$*!TOFj|IUUpsyG)j>K%OwlilU1|G
zxb?qV6ZdC*oSiCKp2A-e_O5Qm8~YdQlxvE;eQh;c>Vnm>;gRtF6YmCmcLj8<onZg)
zZ1X*#bS?MKzXs@>hX*J{S!1Fu`bGty{38N50JITW`X>;&C$tS*w2>%XEtC#I4WWfX
jAa1;yHTgpj5_T~-@aDe@poLx}jsUQ;K4bOL0-Nw3KIe8h

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
zcmZ{pRZyHkx3%8^GPpYg4+NLsK3EbQf+o1T1a}4}K!5}YZo%E%Awh$?ThL(`+~v>r
z)qitN)mc@$pWVG{U3Ope`l6=t4jY340{{SQ`S-FP{!!pRg$Mq(uFN)O{R4`Xl(G~6
z)Wl&vn7sJ6r!{;3K^Xvim;eA83IKQij-dMh;LZ&IhsFRPk^%sv&Ka%hV*dtUQ^j|(
z|M*Y0GHrqXfbRVMqw7B!|F=%;q{sg?sBZGga;TdxUXt=MQ)>Dn0DwA9URFxeYYD#O
zsYbN8baRUM6OS*2_lhNzSSh7DCdw3N-&7i3=XZv|bXwgp>u!dtN--3~ofAp_5gp?_
z9{Tq_ER(VO0e?i>wP#1!{d&b6adv4**73pl%)z-^c7Vz(q{HX(aJEdR%J6?Th%Uvm
zaW0$xO8TKmR1+atSNk7*f3NxUh^n04f-|Bhbvb!+RD*zY%`-pdn$dQ%dAO|M>Avwv
z8kuE{q#>D<s33=G=e7c~I3k-ARggpa4#pDT_tVNi0kJdplX1$mC>cC}*XkKNlJc|d
zAxlnD*El*2i@wATUHUAk<wY8~mnF#hrQ=!2rhPGQajKypscisfHnS%%;kcSZTCe3v
zZAyg_ZJ9ovAQ*mC)F-k&|6;KbEc}VB=a{r>&MpHeH`KLy^rC%}Xhe}n)OU(A@4mJR
zWq&K8B0>pPLU7jk;!<5VtvKG@a#0xFuEUEZamBB&0#gdnL6hTYMHgT;vvUWZ0b^My
z8jW|D+}=*jKcy}MBZ;L^Y#>}2HFxLEKL62O_Wk;+BNNSg;m6h7h=@Q$H(Sob;~Yt#
zxbt<kPoN+Dg@OP54ZB(M%=Q<%C546kCV$v!X8erAokqXyhH?lc#Wr9*{py|6cX}K4
zRL~ajo0ma(Q2t0`!+5ms3PXTA4<H!EF<6vzQEZQv6Ced6tQT6i%rf&#v9xTjE5%#c
zlJxU#enC-?G;4y(bZd99cMEb;J(we_9K-fM+r%K^^KO7&8lR{gOi!91lQ~SqP2&Kj
zuaZ+hI%3F*gmb}&`UclWNtutDXCW&}fQ`}6TV2;~<K{+Aub0$0v!!f*+Ia-Z^2qCx
zg%;8fASx#god$KaN$pL#E=-um%jUa$l7~vT=#!TyWKl~F<wT0{Z2=*BTz#yQ7`dfL
z%)#1cW~F$nQ)_=rdrE!{ij)walqJ(et3lYug?v*k`!w%g`-=p+8)E%kxA%xw_R{Hg
zB_DrG7;fp$IN<*2G*6?K#1g+c))99=Yt4%A$c_p*t*PS(JV4oQnfF#<%y6Qzzo(;Y
z9P}tbX$TK39ymncglrZ6EG;B`Pa}`@>X>#8857d_Zt8;z&fnuRy;&Y$7BnNRcPWuT
zHELq3op3R%w12&6=2(oqPi`R>4a<=<5BR2v4lQ%U<!|1h;1RZaY464J=4RuCmmXzS
zIxA{1g%Rc-@wJ)qZz$zXeB#sABAPn0Ze`O!7lVS7l8+cuHia~ou|3Utoo~gDgU@n5
zl+1)pl+UwGdv=d57hQ*o2c`FMx<`s36W*z0?+H=bQqRtP$#cHm4{>NYP+Q~t>|@Dg
z?OTng#ZjO5-D%KrVDkQl<<VGDZ{HY~^oQ}j#zQSv#}Q-7d)zSnkix<roL>tjPBcO=
z5A|r_wjSp{!_;gNTU&BC*xysixOOIRBQb*9!|)cLKbt(fPI1$E-QFW_ZMIq4-+^Um
znTj%aEtSj@_~5aHXI*gQ7*NXS^}GC7QWdqmxz27*XW@3g9L{D}?N&=>zVN~}2G-9^
z8uSPEm4zBdiMYBaV9#LBm39<XvF*<!oD!0Zm}hW$8}e3RZZ%3Z$CCGQ=mwPYxh}hQ
zp0;_5h-c@VeF2Z>tUvcnWFW<7VSf_n@P|~+{RO=RG6Cd0<XDk@%#EQR^W)RmGH2WS
z-#*@hnpx>{?(=%|^k~9d;~LXqtx-qAQ~%6YAca4gk(JKR>uX<y=D{6P+I`U9m5x1U
z@PXb)+i|vYL!;0dA`_Kq<w=}SouFEKg6=eJ*!qnAyk!+V4HbQ>+MZGc_++uc7s=VA
zL=oLMFpUbMx4plYuLEO8B9yXmNxbWTk;D6jF<>csW;J)<8y%+JI?~1)#%B|ZN2|%x
zxA>0f=C5UEHqg%h@<_`vhL0<*aLQUA_E}7(hj~qL_Hth4;#oM1tZD9Gs!K4<u#}hK
zy)Zgnmgsyf3m*yoV)Ph>_ftSOKogDb@Q>YL=z9+`u~|iW*<ak&LLVZ{VLhlFB4~87
ztD&F#=|a6UsBBnezZi9Y9pDO6(`SvYWX5|gS`g-?YpTMFlSGmKNr851E_?E~nNwQ!
zzKi;sDZ6aGs#o$WLb@&gpCW#KcUEoVLARO1jp(OdUN?6$a?)bH6d!L6zTEWRHhF4n
zWrUt|UFO4lUFlfG%D}@FUE+v%#gk=1d}-YbLq}U-g~+HE1tQXDpMMK{+Hw1e*U#}|
zWe!36YpHTT$B2uFeq%@@>0)xdzeFTgt?CON{fa1)P+1KgsARlB!w?NWP@;goYB_uF
z(U<2&IjOjvyZjbK4}!{}8AQNZ0$Q{vDKn>!uky=}2|9}zK03^Vn1@&{3DbJB@g%&0
z7<{_T8J5gB{#>E6N*`ZP%$`(<THrlYTl<t#A1})MK`N~PzswQmJ8G+j`xt;ZJ3Ffd
z@%T8aH~TX2w*_M4C&YXPTL%n{%3h*QQqNg6bS+&n*my<ih3?Kj{LPg4y;-8+aFSY9
zo`69e<6lO51Y8i!=h{7e()O@Pa6g)D(vBAq;t3<B6Fl0?>zkglN#7{)^cUqPM+<-5
zO5L1^)v>nB@7WY~>4}=HCrJ@Z-HGd84sso>v>ZFaYE$`Y*qDclmF=}L7K!FuQp~aP
zDx!YDGno=6<a-3ak1$uyNyZxD&Zl}m`HNwumWki+#$*LYu8CL3)1hk@e0^-ONXD=d
ziXUxIq2%{mPS7Q<>k*lx1q*}l(4v|{iHaWw-Zi4Wl994Ro|>ht45}48!JOehnhSBG
z+CZI>p`8l?G|%e;=kEW#NfZqfbyD8Cm0Xg@{My8?qY|X1kQR^#_`69bkma!>*C8#~
z)hP53VbH6hTt}uzT0E_8F|}nB1&zUUGzuA$!2rUD)9ju<Z97b5V%Deq^fl^O%$9SG
zYKFnD>tqUFvw(ilO_J#UaO<!l#Arp-#~$PdDVXQ|{UdnN+J1M``PrCYcA{g^$J)+P
zsQ4NmEzfw?Tgy5=kLR5zdRjqgidzTfV)XRh(3niX50!|v)!b*<kvhVT&A}jXLCsZY
z>5-?=u1ud)>`>uA?hdCYoT)DNThSQkD^7epy@8=Kx<pKrNY*0G)RZB0D)CchC_fAK
zi8mSMcbxieqI}c>kEtM9^l$pcB8mNpdMs<f^lgXl8&L8EwE~hHkr$~uR(;mgmgQ~o
zFHjaQ&h}m0)u>8NHAkr=;zV1vzEccNZ!>jDVo?ZikP5qjr!5kEzhZ|`jF)B;%c=QS
zw`#%F)KV+vq%V<*v7GV?MDY%@bRuT_Kp(y3T)baf3sncT^qb>ZPQ5Cjd%wg&JWNo`
z*DpPXx{^o3q>~vse^^ChVT+_Gpe2ONEQ)ScJ%MPRKEuy=s=qxrA#-+^$Zad2OMEEb
zzn(=^>1^qu^P)zfjt(HbqBv_UAr1G4I2&_WKl@~zlJ{BONu2p=cC{=3Q*Lxvl~@p!
z&0re)t6)#>a>rNFYZTm%WxuoRHd+prLyV4lnU)zcv&w@ZdureOaC0C{`XDty$So11
zBPr^&ZigGI{U?;3{s<ME^v6v1g$vh$9f5R6i@~DIzD$YsZ=o<MP0t@(WydcZ%R~ki
z&AV527~J(Tk@$6DfkgT2N*qC?q*=Oa89|86w~?7K!koF*z-pM^g!g0ZW4b9bZ;UPB
z6B`+)`@T&XhQj&csm42K=kc?)R8*jSv^YW^;}Fc~AVbjmUF!T|AI9Le(cbnTZzkx)
zCu#qL`r<uqa$6!5c$Dw!7u&oZ=B66C5QY=_hcu^TPrMR>^;e<<razddMzx@ye6<)-
zMQ&Ee9k=sw`Eo?V<9ENo^_!7B^g=xrEU^)$QSC<V;Y`@@cFHCo2~!S}L!xilD9Y(w
zXK=RL*YVVtuvgDqMG1wyC595`D)!*{cuP+I3|dRXfOyydt%J&3Occs~WASQCVH_P)
zCI<C`K%fF=25Qy$*1APp*iY925-rm1hy2gQm84j(85m4eJ<yEGWA}Rf^@=xG&0Fdl
zhy+u=y`rhFv`29@+$UsjVhtJIA@u~yL=M_fn>zfH7oDY6+c2kihEA<ty|T86tK0I~
zVz21lSlRwdQ>?HOpPEkc4#bB)63Kc&ze8F8q~g>nhJgDo@QqgS(Z2MEGb)kL#W6Fw
zY@6XFx)`&g(&h-l#hi~_E5$UZ(vFC9S8G~VuS@5D$^JB@S4SYRFW!}0ivc-Qx5G|o
zYjJN7#^U6!XiC2i!mQwVPKG`BagH~X1MQkWuDT47R390TrxJQj(w<mC=qCcpcHqeD
z3$1^n(verjw7-5Tz<I$zyc~l;>ty;-?%13=-Y#A6>4k@$gzCyZ2C7+S4B9;wZo4DZ
zG;8=-n?;h=c22TN)1hUu$s&}+xAht2c%-eo<_k!a{pb?(Kz0_G8I2V9bwXSIV1jjW
z%IMM8!hb$DgrpulL~g`#++7eUZj8z^l?voV{#*-6<VgK4I7*6v%G?^2fcNUirER${
zXh4`V%>s}2#%4f?3p!5ndsGV6;!)nutu~zRK7~s=EX*_l-T@t8+Zat?%s(k_Q~ez%
zs9;&a+CJK&G)M*XB<gGI(s0WPIXG#|v9qR;^b9`%<=*@cJEGO9>qf30z*(uK2q8>W
z&M{3`EBTeSMW+S~Rpmz>U))6qwPb_Av?l4x5&Kw*aH-3QG;MdV^YPj$PYp(K<;cS)
zT@>XQJr4n2l%#Xk*DTml1O*;K9H90_BiNFKnDrPzT7T9?V@vL1R0Ezvskp@>fwOg`
zA-^%@uOn>9tUziP@PYMXF3587_}-x)XOSPa5V?p~`#jbcdWu&oX{`OA;au$MXn#qz
z)a7zy+WO+c)xD0-j?QE?;@TVMME7(-@Dw{AKiFy5li;d-Tb;5BqV`sz>+vU#xh$5d
z!5Y<BV5yjfAaJZ)8}HtZb1z8>w&4sCTj$NwSVz`mW&H_qv*YIlhW&{T)Jlzn4b@Rh
z0}nE4H*-Fq5<k&)e41?OMN#O~ykW5fFh`DdegoJTeA-eO@PrpbyWCOT!_CCTH=XcV
zOB!SEG1I0V%I<-qUv&(mJtr3L-wxW6?R(narPgimX}r{t#P%1b7%pGgusO?&S+Mm|
z$h0tEch+rDM+vs2(WA*Db?)6Nj<~i@G2bzPyOB?5faOKHD=XvH?<{&L=M#HE_M}dx
z6^AN5Y}%{$1`j@RS52<``k}E=e!aK3x6=Ix=@UTh*!1bmxTnnOdGxmtjAMj|I=Cj|
zAaaYp&U;Y$-&A-QC3k;5F}!MJ^~Y>~{r5T_0_2)wK-pE#fO?O`MnMInoDHM%bLGj&
z3$M*vQ%0h_m1q8D!oSPQb0YSkq}f;li(L`*X4&CHN+@4{W57!Fa$eHTEaJMCg<=vy
z-)gF3>|7;fMHzBm?x(;qccGVOWb>r6CoWU7GCfY+r!IkVq=C#GlXeC)dO}8Cb=S-4
zv`@xN%a99moO!9Gk3ajoi}y7cZ5x9up@+OSEDPAxe|UwEDslYvm#sq%{Jtsz--G9O
zs^+`rM+(O)B)Y}rE`D>piS$%{nVf)Bx~GMzXw+SvV8$upgfvZ*m+h`C-RWy$SitZ;
zTS2vk80)W(Vtx3Nu$sDP!rk9v=)~`F&w;iecSB1UrhI%?o=&>sH*T9q*fM@2Eexr(
zQ>`{<p9oqQLIT)!9!flmoJisJQu`l)H{oXE=2|k7_frvCoyHQs_TTm`Z>-wuA_OYc
zyxT7PpT+}8s2+TKYco1kN;4RKg(@!lp!#Cuy8MjZrnwH~9z=-QDLT=$Bma17sDXy>
zkh#F{jwOJ(#`AFhK~CCDM1XO(SBOrts1<xPNz`jT*L{TiB+b6m_ULCEgeP}eAh^RS
z8SCk}o6tC<99pfv=Xh|fiDttvuvSJSUH|?iMLi+~@1Ar0Ae~z}(sp}^eJ34(vc!%P
z{aRXSQWx%hUx`<$x7@C~u8KCA01sRe(ufQ&@FUG^Alw>Doj{i-Sr<@c@ymxzpN>CX
zH?ZhnHla`M!Um@!@};3>OT#F1Se_n6jqqH&PKUX}HF;us;r)aoyLB2PtA~=rDsRp}
zvrYRZGwY`Vvf|ZbL#=p>sSHaRtRF#BvbT^J<iTO)De#0)-V!Jy?UKx~2<(_Fa#>x8
z6#Z&i(PxBik>7t^M{B{#-}ZwpclUhdjwhs}Xi-g^oLO3NZ}=XW=%`8v)mXrY3l)sB
zpE<umsvq81DG-SB^@=ZMf(&$Bm#r-CjT}^vtZ!Hb>@V7iqg)!?wJwF_q-68f%7WDl
zIh@emHad{<k3glA^$Fq1-8?gvots|8aNV*BF>pk0ReiuVN;Y4wvW9QSum0ZA9NZIV
zA0LuQLT3x!M65OS<O!V;^-jY^QJ%42pJvG{YHLa=Rg52!No)3cJ!X*aR*QBas@Szx
zKt(qhtDxp`F*b6Ibf=O!PJFtiz>98s=-L}H>jl>#Rihr^;!E(kg)v@En~W>QFA}Ev
zy~4g4{CSQwZRygI!0Rt%U3EBh%VOmhN-yo-q<T)mv6cRi{n&QHXT|<Y$N#}=VgL8n
zI1Q8QM_0u@_{M5<a#ztVFz7pn0vhyr&j#3T!KQkgRol`mD>jUmwLHOA!LTEoMG`Z*
zvX74TEY3XpPi4*8&Je_hW0(;0xZ-gV42hP2424$Sm<lK(L-U{ajXkPHZ}imDobkj+
z`AZHyun)Ix`_*Xl*Lm>LWet|<T=ro2K7$7G6!gX)I8Yu!hqkKzB!>p5IuPsf*yk!_
zUvrzyr%c4o=7?ztR#vjC2tWRz-xe_UYS+8A7D|j=-Eo`3k8vrzB3TFH;&vIp^*8(P
z8O2S{H_Zyh5W8Kyp<GrRKLo?B*hJagal^Puyeo~IdcxZ86Sfe&LGa|c_O%xlU5wa|
zE+mlKgh3#_Gl>kDnI@VS=&z!Pji|3j6)c<ycx^(VNReUv602W_qRQz6Q_{`ubG7A9
z8nJ5h`?DINH&uSZAGg2)$mu?ZlA)vHd!8P3po(P*^3t`OjPe*lL5Pq3lERy<aiQNF
zBl%}k&W@FVpURoqeTeP8^8-;vNfpU~(4e0K0-~ZR-?&=~^LDb~i5Q!7M6_DTD~S(^
zkCf-GQ#bnJ&4qW}EOhv5*mpwo>wqT7po9WVcl#nCryDDj(=J0rAoHe!Es@gVYw+K-
zygU9l;PUlO0C9GXiok`-@*?eY^E#U?&5UmGa6JyxVWnc>F9T4TWvRaYmJOYirtpS*
z?Bi{A<Y?&0u<m-f8}k^a_@^Xnrqpmx_qks4qHl`Jau7nZ%w+y||9({z|0~_x8n&&^
zPC^XVT_n6{_4NGqnwZ^i?;?I}m`M*Af;zLVr}N8iV&svo&Xp}33){1f4PQq%IFR2f
zV9&w!Es$cs>oSpwl4pdi)@YCAO4Xj#+zxJ#on5ZI4W!~SfB);3oBK_}G))mrOz?_<
zkzkT%u=ckrurkUYW~$Y?ZFjP%S}WK4c$#(RWfE%1Gkx@kHT|rUU6NuqO>*{C6vw&D
z{^bCuaKG7V#t$SpDPiP$$Xi*H(Y?zY?rGntT7ns|Vd?Ll&>^DBp-<%1^CiZ+X>!hi
z4{X!z?#2OsCiGw|F*wIv)jLWlb!P3~qJgiIwsNd0fvZ)udc;O$@49u09%{!$yArCY
zmo%sxv%-|}1jn+eL43Leom3FnEgZF}b_L3AzveY3?pnn_#E++mCf7Yld+D6iaQT8t
zke_w@WO+4)_U&;xz8J0o7J*NIBewC$&mLwdhR$yvAS}QEi%h$|#byoM&-t>tVn@??
zalWv_8;6ggqE5ArVFhu1<fwpsl<w{9ZOsH-sobT9AiG}T19DBJM*yEk$&J+gYUS&r
zJQG<H8dp?G>zbkd5oe+q1(+j?o$>hTxky!7?=-q#m0T5g!n^DgfYhRpL%wvZ;C5R#
z_nV$@>52B<5Rt_>+iuf_aG5OnC<v1o3gG<ElIo8dOr7N6W_2{tEJcN`CH7MSrM)|i
zfJ^jJ!i1LxEZy?n*nR?PRq+H>A#tco5k!6DX{}7-#1rIN6q_dqkn}4(kM6*myi|(c
z3rD>AGhF&^D0g)OCgiO)ug-nY8sVy^T<oXT(9DF7L@M6(XhQSy*z<BCJxt99(IFR$
z3gy%EA&1oE*)l@HKJbuqmj~uqRJ;G7Kku~bad3I91@pSeKWniXqHnIgHS{_HHJ?s&
zy*rYFw(}O)f%t~C7(nK21*0I=aOS9<PSrTzo@k*xFyJkXr1jFgmwzA5$=%zB)^Xg8
z{UJN4Z@YMP&mT3TsG)wgqi#S2rL8>B5Rx<wc*(KG+-)UH?J)eQp-6^{;n{w-#bsrq
zt)4u8NZfYbztzef<WUpJxe2Z%_~h8Mkkd%A>+ZP5bVy|%6PLB-@q#E#=iT5>lP_Iy
zA0w2=;+Ob)nTRFee|We)henSaJH-$>!=Ex8YE}UkryoQ>@woOQHsrFLod7~@nD-*b
zUEYB@zaY#%b@4$I{r*i}{)e46ZWz|v)}0qsG>aeV&dj1XoNsotk_Poon9m9Z2CU*&
zSrF=rG{)q{0#XRJqy1;t_kfm@gp!?4A+G=Ko2ALr)QY9^Pxz>w`t3;}rv#rUrNUa0
zs>TD-aTI5)07<p$_4kTLk7uvaw$HH1tm~$Y!~UEqbY<ED-PWObNc?4DK%#En%INmA
z$Rn805~pSEPW1Va8Mo}Ep#xGt-}q9e2#QI&A7K;09hg*<dMvDa61=x}+k>#}ilr37
z&G?y4!^e38^ZGpfA?Ezg=FJjiq0{4ryOv*%6%BKy{*_7qaZEVHjZIUCQIvRLlPk0`
z;gj~htiKi2mFmEi{<Yt-Ze%5V;Mry6V`QhH2EiB>p=rc<i9eTLXmR4m{2cr3sn1sS
z57OhMv;9sy&Vd0HNf8;e@pMcpgGJh36$w48Uq+t;GBn58<-gV7W$}_Uwr?@Yk_uMI
z3{Ye84EWbwbSC4SZqi(wgC8Hg=6A&wZYqQDD#!hnGW0oQX^Mspib6tf{1Nhd+>&&x
znyimRsn1U7OT5x3Z4X!0&izfN+7$2_U$J*+$s0AWSWeQdy*|u2BTmAt{-Jkf>&uUi
z0guzT^CsIPIwh#t5!Kot{8J~8ZD!In=vCJ?x|&tl5$4^Q_V(!OzQivKarMd(oo#Ke
zmWZIj%3wZw6q~1yebK8XpW!s9A;BA~F$1K8;vhbH&0{1@-x)Y~!n*Pk8eHJ2-LebM
z&j(A#MwBRHTTg-~A$W}>Q~#0~O&`DUGLQU^>e?ZmGx$VN@a_%`VperX4S08@sRK-(
zTlr7w;PDG{2|cbJl3z&<CRRpm<+jJvta4UZ8v7jc>NYnSHtUDK4O=AuwplZs$nm-g
zmB=#=>bnpI#E+fAUGAM$D+Vjk{e+#F4}rvy0@saPoIq`a_VJfsqlhD)2TklPNAVO=
zBb1ycNCQ!hW#B3@a9L8y)_w5PE@$;!3K6WP5l-j4Hes8eD!8vF;5I7;MlX_-7zqUI
z_^!J!4zN9yJhEsu?pHliM(#Sm+|K=j(ePRm(>#+>6_A>Z0kKvdZcx~Gx}O(ja`H+#
zsVMoz$i`GUfL+G7iySTz!50hM{zgw)1!*dnOK?wn497SYb#t^&3)zwTEj<fY<WuTP
z5O6cCVHjFSwj^Ir<lMPtqC)cAKP3US*yhQA%d}zx1d-=I!X#3?WYJn;N6$xPcT`3R
zRE=(FNmfCp%@A18hUhIMpTidq0NZq}DBvP=ml3)|zoP=}jV8XGa3Aj`t{~#>`~2r2
zwkl_?M!?VpO-j5^Op<xi^lX)*#uiu%DsX_zEiUNn@Euj!8@;?Du^b3(I+h^Gu?#b3
zS27ZImle#Z@=X>L7^U5oQBfay-F!rllEIDIs~2j?hz(LpdDsR|*3Dso)tstCD0199
zXKA6W6c%jn6@6<0wWASAUy52PNW_l@;%sM9ud7^wLsQ7=>2G#%=#-YO?XMy_@HV{6
zzvkg76Z>O%IFfETMob*$Z_y02iM-jj?xmpf`K>%G)*yqH*)XOda7~Q#5<@!zW3tF+
zc$b$%+WdC+Flp)8J%j%G!**$&w0*5)#?y=j+Q6^es%wVOQtxyd7$tgc<LJTQ9jP?C
z6GG?C`fuDlv8&L~^~ei4zuo6X#GEr-+NH<6dqg81$JLd3xi53*Eu&y^Cbjg60M3=d
z1Ld}d|5hIzLI7iP&a`&e#){4jN2F>&OdriT#)wxREw5+wv1y&iRDL72J|aBOOyS`a
z*1i_lC#b6Xzk}fa9}V9>4?F{6vIWXqQN2q4(rQLGIbAn%6E_PHGZ%}00N!x(2y$@q
zbG#AKe8Vfk&m+Re&Bo0m!p-f~yCeQT3=U4_HkRK1w*fudAn2a~ke5@Dt&}zn{(n$C
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
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

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
zcmZ{ncTm$ow}yX637tq05D^fhN=G`9P=rVeMS6!IMF^eHV`vIW5d@^8K~bbh4IsTq
z6DbO4=p`UcARtKj;`i6RbLYO#oPE#k&Y7LrncbQ51a7FqKzo%I000J<u9gYO<^Khk
ziZuS5tS=xL#RI4T6acDI=uVv|NpoHoT@wQU2onSVbSwazke1K{00@!-fDK0gP|gMb
zcHg`vV^z`ym9w6X7RgCE)@+U@8I7;5RRGBy{~Nnr8ed2WC=h0#4O*bQ#x5(&Wfr*u
z08FkhEvOl4W-B+`(rofPVeZq>P`@u5n`y_Tak%DJRyJ+Tp<32Tt3C;L9sS=|p77-e
z-BNpU!+tQG*1rGaQd~<3>VzhT^?4TaEp0j}0VypqZO5ssIUagX(Z0{ZHL^SE`>L}0
zRfpDdXM1+Px~M)_Ry+43vWc1hj|3+~9de=({7?07@W1HJ9J>B1&Bl^D%7f7m|Gik6
zqp+(%kKLmtD?Zuxk_9qRKd4K9+^LKd{X^c*vmOkEjGqijUPsrl;Dy|HVnB25$`&5L
zoE~TS3N`9$R9M6F;#Bh-X)_;?21Y7V2g3EPe2pIdgoe)NuP1anV){ab<FYZ?3z<!b
z?<+BnA}(>;(LBf<NuzI(6edl(sr5XslI1Tf4n?Mp(i?`?Q|3Dqu0Ab4xom#TCTMj-
zp8!@pwKblSq-E0=8;$oUQ+n1D_mMS;p&5yr#`@p$qgankt*8U_=q0fgfI{;lpgfnN
zkV;X}?-aVd{Vn`k7Sfb_4p+AL{&qaQvY8;=+katu4t{R*7V(mie3!chqAJv?frR5H
z?hBC1PiO+7r5^?{XF&|j)7ZO#OJG80tX__qu>GDHzK@ri{b4OPnEUHbJ{u;`+@_+E
zEZg;$<Gz|JH!O3ioDq{+?rM@%h_t^%jr9{)QYdF^fri>oAK{G4xfj;Lzu(-hOd-GY
zxG*tgDP+y#EQr2r7>kTuvJQtUXB#A@=^b>;fB)vUQvy8pCTvF^f_C%1Z+;R};rlzh
zle3}0_ea;&YMoVgCZM#%UvV_{Ry7bPF^0NLzx-*ys~b3+a$$OG_Oh?M(Yx4_*5lk3
zW$g|L0N2wkp(xBgDW^n2>Jj5D(eH+_9&YK%{l!fTy!mW7o+99_m3sbPEQ)`;`$A+>
zV%~bi<dwNNO%j4=PMqDP-xlgDko`LnvEnNgKeIV03D9O^lR-FmXdwp}6DQr7)XrAn
zO9?kdT2DJvl;hwgxC1$U=#O$cfupeEFr)qTSLy+4>$B06Ww^y0hMl1F)~_v4F;@XU
zUdfE_goYRgrasP|^WCkSdWU=tx^bBqrdz%Vn<)XO1Umfkf?X2E(fs1bB=4b<@sW0O
z)+VLl*p;FPn0DKHUk+wj0k{4esNmk3%U=vZ;^s-?@@Ni`yNPLNG`c+~eTb4Zf|AB!
zl;K6@o{aEagaQ}zqNRc>t;)G~NQtph!{p#i*@$0A!TH&~SamOUZ)2-rUW4cGk=(th
z4-90uUaYEJ<Efk$(a)xkNTaV8`X_zg0O&U8L|LA!C%(DQ2|jPfOpM_j$1FlwOx3zM
z`RTV+b-Aa2CVB$%>@hO+dCneUKrwsPyJ;sddiU^vM9V_cx0-@F^y65qI@n%Nx+kr`
z>y`m)>Zy%%_fk;xmrtLDJ1DN-x8s8Oz%#>3UpCSgF+6SNp>y*vvKD6l71L3fu(Y7Z
z&l~(A+<HW8K6K0*j=TJE<AJIs4TWA>Va5q$ucwyTR0fz;1R??cs>-lz?zNDno!W#^
z9?dWDKC#yiia@C-!Qc9eoVx1yQOaj>)WMi?-bXVw+(mcMsr~eV=w-2+yCJF123WtL
zot~V-W)reSOkJ)8cL+FXysIXM_egx}z+njY<Hda!{B0#)3r#c_)VN!nt6I*a`^ULi
z(`u<N*Nc0pT+?5lI-W4w&BO27u25JuA$pEQCEaUOrHTk3-PY_wj0YK^nQ$YHZ?$>`
zJ?NNanWYK7usWUn!@a7JPbscXH{J>1!ZM6eK`+eDY=}t8n$?jU6)y>Q#LRsIG7$~s
zcB;`mKNqQfn#s8L((7j3$(2{HbO`XhYM){lSZvD|Zw0;ekGZs!tO@PF90z|bGAP$&
z{q{37bo-N2h?mI+(gj-X4*7A}`gqB|<G=)^{kYc*@i(?EnZ`b%C(lokOO`4<fn4tj
zM++gz{@gk|e)}Z={!mn&Z4jJK;tYsIC6I{W5Hw^H>a1wnI{90{LAZ#B{vJhKczBfe
zQeBmS2jzo$u;f$a;jYVK=Ty8<XCA!dxL8Fa^h^SRa~pK)=c@CqUtkk<Ety48WJG60
z3DpC5$l5)k7ccB9MWKphR*#i)zK&@f5z8B3l$e&V-bx{2!7jms7H$*VS!Rs$P+~%=
z&v8KL*?YUj#J%#xm^4wxnAkCt6y<#eM-IXXOb^AGQMM6yhkUEZ{4<WLSHY>1f<wx&
zk+}DKFP%hjcO4e-8Q^%&D9#nO`9_lX=#EXZz&E`|_lMmS>UU_wn~pQ@MHb(>Lo9S=
zT@KE7@KmL<7%8ES2dBzUAAO^R`c8fsUxd=7?#BY{hVBXUBO`su+jtw0)grQYFJKIx
zBZqe4y$_4wp!sM|gV<tN(tAt|QF|z5FPSl=|4>k#Toa@j9wTJ7S)uzuH=dikUSW2Y
zF)HVHy#D8UyX}cT{pJON-QALIe@uvtE2kan#3J+XHsH;0Kb5_<s<nfWHtq%SsSae?
zWaCEDBcGxGF`}1aos2etb_N=nILcMUu6%=BbS9s8%pYcHcZk(N5@6aMUvgI+6y6E?
z!4C!)<^3bW?P4&ARJJRk7Pw$TlW3Fu$%s<lQg@Tz0@RwvfaB!ERJ_-K<M_|v$dF{p
zi==$fpff%-L{d_Wq`vj#%U<DR19$!$UUV<{iUwrF;2HaQ*h;2LFm9$RVzKCn&rZ2v
zS8MD2v%%Ce#@9>89K}$@far@%*7xyE3PXDZfiNEWsPp7G+p9Fye%lT!Pi1q>m_FuJ
zZf*PgNcX(`ZnfRhV{u+gSB_jnFOZLBxobcV5X5OT*)k5wbg^tUce<{@%Do%NxhCl7
z(JjVwvJ6hE1qW=xxq4hl!_iJ-Ws`y;ailMQ&UMW0=F^}D*(HK(wBoh=Rr8o1xmL)|
zj^)1Yq1k!P>Bdq~`pj0M{c{?3**jGpUq^lku7|9<E(jN;QMsivH%?+5auu<jw4uB_
z=C6+FFRdQm`d%0}p4Qyzalon{<?8kn&jgo0(o*YSFho4_L}rm4LyZ&h>=%>R`nDeI
zOk;T0c5n#$-snbNUwgoQjFH(v{7{LGX&J_;R{59ZX9-2QzbHK?Szi+li4yW=DA{|e
z0p)TQ>a)1>PSc{|;w@?R`9p=#azPwsLd&*0otLYO>0^VMP&w7;Ng7k=>sM+AgGH$?
z44$q*X~gT;Rc0%MCd*+V*1>}~Q`)Gv1+}=}(fa3LHnx0ATT02e)|G{GPTPLbxjE@C
z5lkG9<Y&wgEE7f_95y$p?2qk3?X8M#dOn%C4vweRtjK@+{(<vLSmCLRUnwy!L+L#Z
zzjo#2L2lUCjzv{&O*2d9ZwJ>9X$3?`wfDH;Q_{oS0<o)7TQPjBa2F)79Cf}jVb7L!
z@e9Dwu&RdN!6`B%i>vQhn^4f7hwXmu5Dna(#96HM@kQF4==AZouVYQ$n2s=Hjl&26
zft`z+6}{M%jRX3GM^(tFD+wo+F*>1KHt$yRCV-Jmy7&Hymk^b2n>c<#j$&#mPvoh~
zdPJ^~Z_(7i7&RUQ+;MP8^_<o?hf=awFX_+{?$X6sN5Wf{pERY2PvLKV_=6jun`z;k
zsvv*`DBoVM9Bp4MeU>D_<FBw%ul`r~+Cx97eLa?kzpBcK@??xWiV^d>QT>c0qAs;k
z|G6=r1dM_<NT5%ch&&tWrSdQ)lOBgb>`YZ-f``z0H#F5~pg>u2H+Kc~=8tyL2#jqN
zj~8~sY;$_>s}#L5?a{@F9Na#<eOO1iW4VKv?Py3YYbzx|9c&oP7)&Mn!>Yb)(==71
z<ocp7m>FfMM*i^`bM$LigKJ3LO~!_T^r$Snot;y)Q~Y!%S)GX1aih{2MOTLs_uGQK
zhWWgMri^Z9uuzg+Tm>)E_^u4~-IQx*KM8zQ+g(9C6+eJOD2dn5q|qC-)Nlt22aB%u
z@BhRu)B7M6@c~q*#q*;t2lG+uSOZVHmvT?l3S2cV^x4rtNbpRexw)xx(f$42QlZ28
zI#6)A!svc2`opmhZ7mUejeB}wulN_``{LC+Ea3(BLxr|bwnhk_dW;KKUwv{)CmS&_
zOq&w_x9KQoNAtY&wCHqgemA?zl(90QxI(jy=Q(YP{X>;Ebz;lrt4ysjWD+QL`tw=N
z%qwv}lw3QzJ@_iGHURGAWd_z;QN!4%B3scQunI<Qw0Z{n`yQ$ecD2#hWzpA&Zh13e
z(=uPnwBRy>tyoq^^Tq%|kVStuyP@Sk)r{@)qoKCj&CQvL978S~)m=31v2@RhGfeK0
zRTob|0;$HS|1s5ooXh%~=x8*uEw7Sa9HEa3=+X0yeQnc5)})U2p+G`5(2bv;HDUS&
z@vSUtn$t}azJ6lMCnHFop*S(9$a|&cUlrcu@6x-j)xan<0AI7xZ5TCXT7dY))x_J<
zwrW<^epeEPJ~MVGm%U#YafuTNU3AotZ_9*VB8(Q3YrO1KoM&Bgr{8pDNvlFlykh&B
z()G1_DS6r(ateD)i8|_kx^K7wX69f<ngT_CyzqRIC@0A-4&e{hPkuANnLP)$&-2vQ
zzwe2Sg)xx?9_;p@Kp(bT`NBC`@1>qTC=QymDHWMFfW>CqP=koUPc!y!Nw+Bhr|LU_
zW^1%wt@*k3ZOp2@A+m{*(CL#2ML+K4;If;P$TzvKdt$!nh)BJi-x_YvAGW<n-8#aX
zJZNL?(W+KZ8%_z>0!bJr4&V_X3WAJLtKADXBl+vQoX2Z>ll`QMAM{^c`T;RQw3^e0
zy0BASozW=vC~;H0H1O@OSBQm$rL9z5Th36&k4X3+x6M9p2@dX@tVk6N$4@FAIz;yt
zH>}p^6oUMGkm{Qpl-JiH=t^!0s}#&w^vC?9GRAn5*@g<<oCDLEV9p%9Wp(qp*K)(h
zlmd)A!_^P54ud;KM^gJS8MnV=mu+u&9>#b-spjvg+MRr7bL|pe?7XiFt*@c<0!3)k
zu{S*#T+u(sYl#ECY$Eg<I!g54t|$P^MbhIcic0z`Um9%eTFAYV-)MCtO7WtrjH#P`
zbM8y*&k!df8F_kjaLUinnO-WVHb*xy8dP5lecxRI?L@f#086xGP7J0}n-segWHOrQ
z^l9B@k&_H98)Z@ytnK4G-w>RPC(b=P$4=C*SN)&fw%U2+`tJ*d8P!@k>N*6e1-}`n
zZ5in56o^oE@kfvhkdcyB5SO|wE~98BBddH{T3Jp?OiEf=N($AvqV~TEypgURZlV8w
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
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

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
zcmZ{kc{JN;7ssFE7a~YRwbEB3j2Bg^jU^$prZNn%H@aBojo6D+2{oPCtEjfN(4zLG
zc(s&LLWPcwsoJIq9o1^eG!z}%G}KaW=KXKxoVn+@_j8x?J@=32oSW|AWP_Gfkp%#t
zX|`5$3CVvtR$3BYkF}LZfC#j7v;^QmrrfrVl%!VowWT`(a7i10gew4SN?HkX07MZ1
zm}dZBb{ha(_#N)aW0HY1)858PLWzC;rZZjwRJg5sq=bzB`*H|%M3NxcG)HUXJ1IQQ
zNaw(**d+j@B4}2Yr(#}xd=>8?h{E@;%+78>UEfsOqbAhhCtLD!UY(<~=B07#{P~oS
zFG19saY1qp$*=K+)vP0=u$FsQx!E<tYJ9y_oBP3ae41w3*O*y>oe<+{b#rNbQVk!g
zsFSYt<`;|1_?zqNti>2!cjMO6L`_=GUth15O5AeHF+yg4b5d+-Rlb(ypC(gI;xPw*
zE0+Q@m75e;1;%C&(can`Et{Ytas-P1J_B2p<3VMW(pw{&yDKp-UaYPzx(CPQuHDt+
z!^ru?g$m&VQEyN}TfsO8vgiB=Y9_fL0a69WmnR+koXu~HZ)a^>%>ZL{U%G+0j<j%b
z#KaK%q-yJd7G7g}LABirjS#k<24Q`ehkzCbiq4`VgM9MN=*GfKM?3-ZXf@Dk<iw+!
z-mT>-!JHJj36OBE@g6i9!AS<9BmYH!Kp{J8XyJsuvAotYy-F<vc6k11UZRF<nJ9zH
z2j+(;XqRbS9PoA49D;>^R>gt(C>~rrPS)5N*O3tVUFXBSZhUQoa)`30325&-22NT@
zpIGTzg@F=M_eU_ZnxhSAZf$lUT})nip@nL!eBd)cR775>EQgdy0+={mV+Xpo@6n1c
zTufE^jOeNOvT8B3Kxs4n;4Q2PX_+y?PM#|<*0rpolQWchSob5~X;$T)O)nL50>}gp
zCAZ`@(o#(zXB~}QnL&Q~kHUBrOe-732=^5D!P8JoJUES45VNQ*7-BDB*OB4aTL1k(
zK_N3z`gZa~uR~Lit44E)ZAS9M(#X=SIN5s4>41&sM334VF5bOUPPTR-D|3%a*$)@!
zHV*>z&z4r7o>;TFU@x1W?@8Aq?I7xpqqof0$>)or?z|J{jU8!eX#1&T2~)q*N`^n|
z-Nfp5tU2+I=-sLeeb7HF(_pz1IR*V8vfL`8>%8E&0TCmS>vZU}IN6Nu<@&Ak59VLh
zUN;<AJlU-@&-7z>JIo%}tQYLAiA*lX98i7B7$);Vjh#ttDq}sa(|6hli&0m~TC0o+
z<`zvXnZ0Gwa!OW;1)&Ibz_R@QE!C%Ql%dGPf-+G`qnw)Db(A=OdMbCeNsJsH)r6Wh
z^mIt2s8A%2MKGvXELy+ZwOk!}vB&I^`fMt_cK`e5tJcYFZu+jfGU90JXvni{=)jFI
zg@)kV=JY`Mw6p0m6ryx<>aFs?t`GY@WEt^(XuNHm#l844^R3O3XMt-6J7z5JC_4EY
z5+Sv_Nso(1`9&GoHklKV3s9$X?)BhLF!$%}gO9SBX<rL=@P4IHdmiJMu>*S^<LhPn
z?v7JNai$sgqrgYL^(KhBl$OS5Jc#f&j>C-?_IONIQ8e72r7rpo_s!`OKT|iZ|2*Wf
zmiMWm19TOV#x}5m4-MFZy>>=V<W<{Ko?=fteO@W~%()PPn`hBp8C|k-aSabW)$j1=
z!ak11bS(%gwcW#N(ye`u8NK20J2M{rv%FZBdsUPum9(dzFBh&+Y+8b>+>I^#txdbY
zUAQys6?_;Ob!-1u(eRF*h$iK6WTr|`gFt%-?#d$O>|=a;;ffUF-n5}qR>gd0C+>te
zY_@FfM{K7}@qHdNl`7f$FAjCO7BQq6l!MDPTTB&P71@1!vFLSPW`JZr=$hJljhmKY
zP{i1oBQ*AN%U@dfR~MqDf<<;S>a}P4WL6B){HGPOWyck_Uq8Xv&ASY#kk8eAVOv>T
z4j-I2$VF;?=Xx|{B;{Ht-}{ja=P;oL|FDIb@GJ6+e;ExkQMH@2Ejo|;WqIf=<E_Hq
zE?u3{HcETTwD}n2cNNJ&)?!<`vHg75{${=r{t^H~qJfD%k)&^EddkqqjAUSDOw=P9
lm=TFFPu?H@iy-X0UvR+p|13b2dM8Q*fM)Gvb)U*e`X7Fe)fE5$

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
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
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
zcmZ{obyO36_s6Hi2mwVxVuVuC(mhH6sgVQ80a7A37~L)SMFt`vt;CR;NJ>l@DKb!c
zlyrBD8a#ZTe}3op$8*oQ_w|W$|N6wa_niPS(4wJYr2+r|G&<Uv#@Cej*Kd<w$ElI}
zylarUsOhT#0AG@+FJNTXb1p}1V|@T1hz|gWhyei3u9qTK0RUfd0ASr708q#T0GMCp
zd^1wI-XM3-)zZA?wVi4-hhKy8mA0kNHSPcFyD!uSt_MJbj{ald92q;aqyU>~=neot
z-=w3dW*UIs!n>ut@2r#Eon`q@mQC&?9<yh!m2=xC>G$g>jSg-cSDc(y5|0sy1H^G2
zDJKMtW`%1eu>w2FKf);l1-k;<C%VYhQdn3&lnuxaoENTh(Y$tQZ4%n3^1ZZMR~iWX
z>^^o0-NFY$jh?VPPy1it!X-tJh${crbW^WtRiAs@YqA#2=qom!@VyeS4h#^@_%yVd
z60EVo1hl(-sbfc4Wziy*2~nbNnew1yu(Ldq3VC$YU<3ORe<evFF%XY0yDO>7wPxi?
z@_AG*-Pm%9;fD#`b6oUATP#?;JD+%Hy(+O)Kl$S?S+`7?cpEWyx04ABW?i24*;zt{
zO4Pn%XTndA7CEx;9o0ZeW_pEV7LVJVAty#BsL&M+x_D7VyC(S}V6DpC&6;n#a>7LD
zEAz<&_=)U~nnW$W?>Q--_|=@pW2`pTN0}XHSo6ZDhn2$)c`|3_z7q=PKJ!0|HZrpU
ze#GZe7`R@r|51eMM|$!nowFSZ{IgBI_O?HqE*3-f(U{XkG4f^TO>@nU#?L%b@p*bx
z(TARM@Y9ZltJ`5BF9G4WU+%`wzTHX(A0G$47!#^Hs1)cmOZ8#n?1YB^sR(2r|A=IB
z-c)9?ITA#$Nqg#WeRe04tJ))?8VVy(pOp(?n|Gt_g9b?6>`p{$<x|rv%mz6-eqG*R
z-fAyD{8Gkh@n`Q82AK@p4M3gu-tZlK_5H446nw-b=EM8`AKQH#F@9sWnn6L}b7Njp
z!j3=n;%xr_ng1C_(RSYjK)7B)5H-PS_7c!L`v$7MZa5ccX0tUicyhoZKUh3*@FnC1
zt6|P>67x{=;C}qk(=89=$GWB0-o@K}A)Hg6WEW?9!^uWM&p<b=41ylgZFycjcO1rk
zH4@YP4jO@~W0Cx-(<#8(D13c%JT`TCz>9jVuq+R`jWqDmZamU+@b;<IV@y|FUPr9%
zG6ic8nZ$@x>jPnwrpc>>&{Zk_fSd2dHV<rF?S1Wfs#a5?a<q=)Pv2C5sJ=4Wh=Zs)
z+riwD;9x->s})(g2lVC!Z%~aL?&5tE+9M^Hi1xduqUia8vX@cgtuMyRFA`st9!In@
zp89Z`yt|}Nwd|}MEqr+RRpNMPs0sNYJr@|Oa*D1Ax0hV~Hc6&ips`(B{c&04waF^?
zuKI>p0c`wTa{H9Q7!M@;G|l9Dz6UVt%UYW~otU~r%Q&?ZAKTRZQI{`L)znchRqDpc
zQ!xxKs(iV&6j|?vz!7J~Cfjj%>f}c1^|-6WcCJ;h=W82l&Xul*gN4&5OY{<MV3YKH
zvloVJk&}w*w;r8#lEEw;(_^xdPi}%1RQ0<0@r%2IXZvh+q5Q`Lm@qhE$q{?Lh?c9`
zGWONSKdfUr*RgqjX_X@|sT!t^EUz)lcSA1`^4Hj3voiXZZ|*pTH>hK?-mMpG(}7v&
z>Rdp3)Tn&M*FSS^Q~Y!qdc)mRD94s+$81$yNuZg`pt)nN{&AOv)U)2`W`=$fr@Iyh
zTw*xachKefewhFtj~vG?ACUhO`C&)-=n=v*^sE=DG-n~8V#a>6EOuh9pctg8;(7M&
z-3pf($m*zTbN9tac(=Eduwm;SV-das-VyWy?^d>hCo=Fe#;fn69~Agp9?C$zE)10y
zp8mYS+08+Si{m!5q4Z@2nUd9E6h6uhhd)}XO`=D*e|b5)5yclIx<+I}=UHJ8Zr8ui
zsb7(k>LWi$;e(<ogZLYv?pzG@0&TQUV%<jw$Jqc70lcM;!n<M6vaUXI!r_G93YimI
zwT||kO_C+5$CU`)p7sB}fCvzXGOON95j(om7V4E&4d6VUfC(@#i3HQMtf^>k<#Vts
z+0mYY5~&N9CZ^d6C;!=~iZ^ct9cFXQrb1y8@rJ@Nf#Db#y+Msq1nH0X^i$yvjUxJS
zPMUDtL4nQbHB^HacS+1><;ME@y3G9O<kNfOA+nLhc}XB#B8l}x5!TBhlJ}-0G@fxa
zP1QcM`eD2V(Z7WBCUEEMK4NNl_%Y<DoBN=k;fC&9Ut8%IwuN~I6*p|e$`z`f`Gvfg
zTw`G;Jt=-^5)<f<_Ci|9fJ*bZXfOK>18pX?y}$Fq+FfLOioVL8!XXWl`Ozb5=0_$L
zex0q8*cQ5~Y^tLS@+SQxQso+2HQ5So)XQPrl7zfb-p@{{LI}!R6L)L<B~EG{DsNPy
zQ{b^Sw=Z>b87h}O%h2@SzA23U(sb~;A(^_MT1oQVrS}dpB=6$pa5hC5*tuOZ06alO
z)#R{iE1D$f-X&UTe_)6U0SP9v)=F2b?v5LX6B8DiRTs(*IOB$e3T+<^7A;v?4FmN*
zM=@p?=xUs$qpEGxE#YqQGJ^-*3o{Yvrz8y#aS3;W+H*vzrs&iCf==CDIrF$a3F1e;
z9H)MFK*b-M#oU#<o=3INSKQ8F{h%>c*~DM-zQHpM&@X!PvoxN~x(0^mcClO3pN`(^
zL&t++r1fT;wMDhy%ZXzJCmSbf=i_~uC)WEg+N580OnsOx0-<{aB@j+Ok9IVH6>sNq
z+$sY~V7X3tCP)%(SSKSrQ@$sMNl_@!HKKWI13cob3T3Vq2nBnklEJEkKv`UDy7Ku9
zBjpPkA?KC@pOcn_hq(pwC7umx`bXd}Qla=ZBKfbd<BM2yZ8tcY@<RA9|FXtGv?!?5
zHqJ>KCY))S1L)1w@qcA29;lP>mfOfqt9yU*<g(BrT`K%pNDlM)o8Pc+x_vSb`Q7LS
z*{2p`Y)qK!KBEBG9z~CT4u*c86Bo+FTAdXvz8Eg+!Y5@b?IPBLc|>sNA=tc9Vc@W+
zrJ^Ektf=n|F?y-)<&47+OsVAyK2o?cw>|k~p+v*3l~tO0MT9DUPyV;R@~dI9<7@>J
zUlj=ycEWP<qdnbOGPLG9drw6|R1o7?$kwmKPV{PC?+<|)X2v?Nicn~p*jR0y>C|uG
zx3hNieYPUy+>%WSY4HtKG!tc8)iIlIb8&HrbGh5mo4nbCn8Z8ThB2F?AfURRT6{f{
zWpG<eeB+<`ZjUr{p0XAAUd~&+!}S_|&6KY0{bLJW{JewI(<JU_BmBIAj1p<=2VQ=)
z%g?b|>TTYay2yNSf{?3{KhC-*UvWjZXI7CQ(gPhh2T)~;lts+XFS)2;GuOs6N++~@
zqeQi)RajGhe=SjShaB|27?^Wv|9k_f@acvBiNh3J>&KKRK`Q#E-SH;fT79Kx^sfsU
zU9RRL4Y3}Mra;af+uBqAg8BJ=MGZelsVLIsH_Wi-Eq?P(k6w8j&{(%z{fWk#zg6WH
ztVd&FKgR^u#j1K8tlyoYX4^lBho1c*%5EcazV37E>cPc%lKDfwAN0=r{p7TA@*G{)
z9MdY|Yj9?|Yb{gcxonmkSMjzvuEz54ZZ??0@0HHGu<B=}!}nUd$$n5^%#}FWRzpUG
zUCqa~{>q`z8LeqsRB_E=Th1mXH84Z@PrDpaLWdT&a_g18fe|dhr`z`Vh;iLIFjz3a
z(!;^*u6(s6blwa$MFQ>CxA)y;WrJcU$%n^Oy>%Xqr)Ip%;<_Voztx00ZzCTMG6oi@
zhX)sXkzzM7euRy?er|7EeI?7ec-bxrv47s(H-wW{Si-8w)mX!s^Po)JYZh1H4DRVU
z6sP4(xQLLY3*5g4WPMr8C_}~Cr5AorL0WNr#|US|Jt56$KK@J3ZHy*pErU)-&lzZu
z`vK1Ni+GrKXHa~zQ~Yx^bUdI(bZwV1ySBY5dK1<EOx5|>k&?DZ<rzyr**A$pPUtwt
zi<+!rMy7?X#&+9&+2nN^9R9G2@2~<BZ-Y6hvwqv2*14kEws3K~G(?Ud|6vm*S+Iv$
zVW&79Td^fQRiS>O2D|vE#Beq?FgM#64^k;$TQs!UWk6tpH=hrB?Bj|VPY+5Y(L@kB
zr~#T6J&+9YV{zKK72Nl+nLnQKWCxGUEBB<yQrp@`hBgo%Bd5O%SwbFt9D0CkbvoFd
z3v5-cpm92O^=JFV`rEIktF^<WL7pe$(@AHd|0#1z$7*`%yy_KmYX=-+b+K1EDCg=-
zy?Qy4l&{(+a!#&`B&CGv1+PF(E}Ba{fQ<f#Y*OjU%P%w)>}SUt;^z|w%-BC1S4yBO
zd9gjbh2M*bJA#DMzavT8u+D@?lrekygjg5sfdl(!qXE00$v@ciPC1WeSD$3VICL2M
zvew$){#K@W^hI8|M!FY_$92AI0ZnH&%SZaNSWft!Q(ZTZrcTM_O|elMskya6CF`Gt
z*d10E(VLvM_4==|929U1(JSMJv~2y);1<NbA6cxo*IjIr;NzleXcxcN@NpY%THTC!
zbfqJEy{7oIY*hmGsjbIr>=REpS|QuU`;bOMldw^`oaV*l74J6Xp)aB`(q<z<C7(qp
zMm}p*^ddY+%);6C-A+p9oKE(;hU{Vj$Ete~F)SxRQ)!rtAS$XACXSd7TRU_(ZG|4A
z^J8Q;mk-<-f_%V2(aFhVIJcpv)$Qm|vXBGTiZ$<#ehyVa)3Nm+IzWmhgsZH?vt_+*
zv4W!vUy$rJZ<rH*c9bvW&p5~U;mjlN1a325M;=s~?uFnoefN$m|HV)V=fB0pTk)@x
zZrr<}E>EPLgd9cT^B=4otk9o;g$~9eo`dUsSKnlQLL(AeKQpPpjO0oWoW;%8hznG1
z%-#t;F4K>0rQ<@5HCJU8z6BS$4;#+L3ZBdM^ByNOb$}~+dFx|;iH+Sp>E*j)@eEL|
z_rf?`Lc6lkcc$fw2T}Hp>9?bl1X3Gj@7OXsG83o(c@&jw?0eJcw%G}Y<VB>^A};uZ
z1%+RGohfP)NbyVlNEQ=;Po~=@D|dJJ<3EdhY`86Y9O<Md$Eyu`m)A9Bp!cTJDk*X}
zv3{<_BXBZhkC<P0530GIiFoP3zes=e?1IAy7#C(v99v<8C@%b+6JJ5i)+TwIYmAI)
zv6D7Qa<tL9<H8ESri68Z9D}D&8%b<PCZx=+L{Upw<ZaN4S<PhLR?quwS?KWh1=$bO
z%!qNS{i{IFxT&S&<EWqAKowS2_aoYhb-7aniioiH%4|ja>PO-Sa*-VOaM;xT{jmtf
z8S)9&E?^P4sxhaPzTbuC$w)|mu$HQjqF<bo4tsaRFo!<gaxS;-TxSP_!y3m20GwUA
zg(LB@$8O~1&-AuI!8xSw33L}Ci(yx*5~$NY5>5@@jIc3v*c2w?`;opw&2oNf0yTeQ
ze%##^X};~{UCW~*;@c>L6*@z;rRnny`Fzr$g4={%o;*3bX+~#^w_1;x3bUT-F*;zr
zMFC8bn$lUqkK-LmNx1PNSjSMi^I*vw8+Pwp$iPPOa5qdyTbbddw?4|H;7=s1pv7jD
zUtTgN-f~U7hl69$JyXG#`ed=PRVEte%N#-q@-BU>d&eM0s2U%9V{udR9&4QPH2bn&
z5<f27!e@Rey-v?{ry#!CFsFZ#r`?#p`!ONx4>{Fzd&1X%s%N1CRpF5arO7AKrYb7C
zl@>l)==0RA@6_2ul6?_y5TkQmV33x@AMqug9uH3U=QDKv3aQxngo90O$U)=Hr%;lo
zuS>~v^uJI$(GJ*BigXha%D#4SR_I&w5zb;XCsCUM+A}mzDul04=3ECKG3|`_vlCf6
zP#yQ{V9r1*^<fLy*O?Z8u!s^7v>Mc(NefAt5o9;qYJ2663W3dP+>9hy(ZC{0$-hqx
zkBn&$(HT)~IJ&z6KG4RYLPJ4zkD1A|{OiUMZbX4j^yjM^bhf?v0+9^9u<ubm4iLRv
zXGihK5S5$~q@i8b0+FU*qTviy3TauXqJdn6a0xbtwn+O{7;?+k+-~Wr|7~^lp@3#4
zMQ<zrQiNx(%JjgxUmMj}sWo1Kv6v3us+k|<$X7eKu9PZls)uppNU4+uKi{*nyxy1O
z)TsArlr{tV{>1L~&NMs2e(%YeYASEC9MSV#z>hGoKhFsyP3IhTw9;?7?MPmlABA%!
zhU=DSz{B7}+X&O`yX}=zH~hC~lvfO=m;?u=#5!c5!qonJewGZ*tBr}<kdWt=;LN~2
zN)6Z(=S4jMoR#k#r?{@*gw}=1G6LC7+4D5+)3{eKo6T$mnndnTMI(`l*6d+*v@usD
zgLOJ(zU3#=kN;0^I3TgQ)*HyO9$;HL<`d26u>bhET;6uJg{!j(7}zpxbI%xE_f=Mn
zlHP%hW@hpp7+~SbVS?ML^lH_cLhoGy0gseh%Enx2K@zc-L*D;WCQ94GL|g%n13$eg
zcH>&R*0p#Mk1Y^RFvN2ONAKs?07!^Gk`)n`7LkxMm5@}Bexx8JE+qa)L0mkbeM$NM
eCA{=<a&r#+-wBlYHj&o}0G-DMnpNudQU3vlKG+KY

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
zcmZ{kdpr|*AIE=e%VlH=bBJcOIFx2MF?noku9-MEb8I!2Nan#>%cXXaa$Jf-G6$VH
zQH!I7BOQw6xFxqHI=QAYxl~R<TQ1Me^Uw1<e>~sU_xpW+FR#zPpUlG)4{c2&O#pzl
zmnSJe$#4EH#1>^A8@hK@31~FYmk2;jE_^Kvrrc2xo&ml9r0fBJpALXRdE&nX;1m{s
zIR*fDApppP(nkM-%Ey*)9}kj}%8<J?@s!X=@C-SrB;((;80*@v9MsrezGSs2*bbzv
zg>m574*<Yoy-38sq>*<cq0B(Cq2#a4(zu4uy;p!id1m51*4JH_kqbUn>H&!JD6=u>
z?&J5n(CTR&2vipwrCZ?ohDf|kvsCY{r?u9j@;p(RG4)KM#bs&5DFLU!d1gtV*^b!t
ziP==r^C3<)RT3{N=`D6lB@Ej6{wIynYpwF0&o8GuL~A==Pnh8}jsLSDW#LqAt&>?r
zRPTw=dtpe-j?BHGSBkz{b#Qm{Bc<9kGIZUMdt2Y8kqzl$^&4=5umzXlhG6rc05?CY
zwXP2<Z8Z-WAETDxkCK;bRH;I~Alu<un(YFFdyj?L-u8q5rlZWkc#df|q)mFB%O_*F
zgs_*Qj5BfJsgH6NKBuK;n)Uqoi>iyrL4h;f-Kmh^wFq_;tb60l1D0wl_&wxJbyA6K
z<psX|E!+%6M}n4YJq*d2cHf^Dx)7nwK=`~KsE9LAjh;8{TuH+mp?!6>c{kM7Ks6Bf
z8dk|vv#a@XJ&||x6RM8rv`LvszndgfJo9OlVfs;Dj}FUdm^H5+b~_Xh;QhP|Rn_ZS
zrxlqfj%nAC9POZX242fyhCnUCf2em^_qlwSYY(0Ocz+|gh&tI5GaZ8YgPi5Jm$g;l
z`X;<vTtxdq(oEgjXXf|!W_^c_ZufB6XKEMHR{DK&ZTac-nV9EI!K1veHDaY+I>UpO
zHxZy2DZ;p0b~Q?Vb*i2knaeGZcDON8xj_?bET!EqfucHOsaO}*p~%BpRq!#2v+({q
zA5ru7zd5{fOKR+#spG{!POy8V?sAE#ybG^!@YYsQlv$Tc7Sri!;R^Cs`|FMvuK8?m
zD$0$BSetw=%rAxs+SWFb#~;;H$cH;J2tAdyf(jI}Johsw*k&z=NL}*1sN>2wzOnFN
z;^onn*Ut~R9CS>vI0-I2vGIc7o_XyuOk0D0T`qnf*1BmL70|7Z3em4JTWzxHEGsz^
z2^SgkLBT=Uk8`>N%#5RE;I}yqH_PBjJ!5nJ*S3}Z1qvhjE;`lT9Cmm-_mdGV_5oIZ
z16EbNvYjyQtiMsUy6NFh%6OHadt&M+R;||)+UEtA&vF}L<5<B8Xx^)r+5l%V>u;=r
zd|VFk|4l+4q(E>c&Nqh7(R36lw0S&}`{LW!(v#AFdqYP1553?eTBDz=lvxpW))VD~
z<)%^nnPiiG)kVJv-qQRHgyEH<f}$-Qw?FIm^%F3a`j#qhGzZIf3Ga?2^-mgycaJJY
zWUgaQkoZG%wP$Sw$tTV=YUurVzAB0~x{<4fy12x-%Q1QOx@KeXTyO3D`A(8I(z?_|
zbiV7@<iOA!3YvFC+Zz@1hBZ47bmtp%#YrS3=?`->t4^ViZDt`SI#WhlW{>9=3kN@y
zAQsfkJYk6b1et1VHNOy4(tCRT)MB7Zc8sH_R0kQ`TKMJct!&D<8}Wmesz(G%#nA^i
zzADY(<spFe4{>?8F?RR|8*e_V_V?68&V^Smf@Qx;Cs#R!+`*@}dz<Bu{C7VuI=9kl
z1+Y)k2IA45VoX$OAGZVh)>Co~LXhJ`mbF^)d)Y*#R^G)Hla{hAZMKCdu|ycggsv?_
z+YjVZk7&_HGGZoqW!j0%{Zub+)X-@(dwYwAI&S-03CjplXuqGAt9I#&R51Kt51oI8
zb9);j>*=@<)+R0fP9+-^szSbt7<1ogUGd(G={Mxq?SOb#an<1Eb*%#>JKrWi#B)c!
z7;%`(9`(kH&m6riD4F>f-K3UGy(yl~py@TG@30@CbF8W9Phr_ur73l+M6AE4D|3pU
zoER9C{<q87^+xd^>)D-`w^1zglunFcld0^;F!nKg1nZa*0Ee|Xun%j$59bhwv&Gxn
q;O($hSQ|VRo76h({6B)Y_{f;3<o_?w_?a$H3V;`xLb~J1Nc$I$tl}8}

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
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
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
zcmZ{mc{tR2`^UdCW)Q>7u{TCD6v@6M3^C)3C0k?)nHXz2b8I1#r3M`oqK?Osm?@<Y
zl6AruWGPDv5*b^vO_m&Ej{WC6fBl~8xt{lRz3<oObKlqdkI(h_=f3UaXe}m!6afH0
z?2HZJ+yPJhV}#&A9UH1EJOJb}-T@B)RT-i?-q3?P#@FVY0{}#;008Y40Bjw!X!8IN
zsRICuWB|bC0)TAj!`IHH2LnMLJ8QxL548Df<IMvc3bk<$KOp(vUZq&PKR5_QoN=%e
znu4Na^;PAGaVr2IYJG-)CsIe3Mq^0Q{(J17@AdVQ!x1xTU|Y}$&!b?wpZDwhDco#l
zs|Vb=2iawunVcw>o1SFpla}}BK6RfeN^ak&pez=*j5f_&a%!4^YNt@YX`#pgg}aHd
zQ-Zv%m5z|>=l|NH^y`QB=Ur!AE}YwreNXG~sdCehN&WxGE>>O+nwkAawj+bb{jRtL
z{-fuJQGOH&Ny=S51?dcSui>r!*1cw)>7EInoC@uOXnq|hofg>=Ioe?l&d#(wMSdn7
zjFUFVb%?uej%G3`pCh;z_!l?#Kxc1A8nlO?Q6oENK89F$vwC{3$Jw>E_Z3;?i*6mY
z<P;pjnZN!hF=*spIWIyC%eMt!#~6<XIW5_p=d{TIA$bA}ma|MlpZs_wvgz-&D-G1Z
z0Zz^<^5BN~OauvH`Yc38pw-Rob0yNrwKS(=fI+yUFm1=i<bS0p$V%bdrYJBTxOm6K
zUJsI6m!K;O$45R3_tJ=l$C^afI6o%4w;by4`po_)U6xAcz+13GF%eETb*!?S6oh7V
z=al16f%H=AtVm2mm30%?M#~9o6p9a8?Acp5hYZ}#SHqtXHp>hU$XR-HH2YXWthFcT
zgQ2|qj8+P2WZ8Gc^JSy&yXVKXTepJW3KfnCKB`Q<%ZCZY*-UZ!MKNMUsZ4au+#oy)
z!Vpzh6=Y=n#!mV?>F$Okwv^dd=>8(N@=Eoj9M!22WptSEii*I+;1yJl2<g8WON8fg
z{f>{e_e_}bLY<6b8`rDvwYUS}TW9A7ltoe6M#Wb=a1$4A=^uXM_KQYw;wb*MY&i{i
z^~57Buk$aMD_yE$H8lZ87=N8*qIHZk)IoS@Sz6<h9#018+>SGT;e=zD3@qOs`~kH{
z_J`T;ZomB7krm2{>Rj8SkORln4cn%1o!IvE_pL@Qtnz@vfqg?>>MQX^%AI#2*fWs&
z5_xPnb7f*@mHgzRM}&~nXlgT!?I_PqH&6K;XlsB%hK^KhWi>S~Kr=lGTw6|yZmEWY
zaoqj2ucI2Wd!M2^AI_(~G(5UH;Kl!A{_Uj|2nuL^G4C)JoT*S|jl?s`T{G0V@dX;i
za17Jp@aHjp0a`rwNrEqpVH_7PfnD$dh4q`$ABd9foi5N~`!BeTpnC_DoAm}j8F#`a
zeg_3H?+cSFBD3d`5?P}o{8IS3oE)p91OJ8o(x-jE6~j?Kv3^?;;U;A?swuqwrERMJ
zFI<Rm(j1;rY*wBIY6`q73P{h>lD6!c_(<{GLpIAV7g=?-#++DqZx!@dlbGIKXD$>C
zZk^8No<a!JoCb*_^p}d-l0YV~E`<<w_rOFna!^)%$!lLA&0-ChAs+TcB@W-&+D=Zp
zCEBBh-Myx2U&!yTNRe`SxCmW<M_c|3nhU{i7M;VC;*B2@QYCP6Fv~%x<EB5XkZ0?n
z_-_qzyd$ko9hJx>4bA?j#4WR$1N}|ApAJ#9{6SSw=EkPKq*Q%}*b4?2NsRJ9Rl^*r
zk~Be<4y|MgfRw(}!M?PDnd0jbMFuw*&5y-p&JM+KI#Rf@GeL6nI={_UzPIms9dE84
zVCaht!d%TGO+(!}-__H=q*ah<=+tE**#up`vANvNwRI7LYUn&c0wzm9!6iLO>a$m0
z-<Gf;*7<d<m_I|dR2t()G()CmV2EEy(>uwDroO$}+lV(srR$5ZcP}<>ds%}-RHSj4
z-4VwG5`Qo7I1R%Unu@=ANc^cPr@fH+ke*QI5{%6Tk-2;vD)!!uRqtUvxw*Vg-!jep
znyD<8A#XsL7$!s(IRlKfeIDeDQLl#YN9)AyW(-P{_%PiCzFc<&$+_oc8%XpTRz~GY
zLLVnCIi?0-=xP}w!}2yY#yeXeB*&71$S83h&!9Ca`l`FM_V$|?d7}}}d#^o7p!WE?
zt_C8i%G3U~quo|(!ZrNKKJ?+*9YeKBi@r%oua2~Xzxh4ZS7E(xIr^%j2x?BU5PE<7
z2r+9N`S3>6M8!ZJx$-xekbU)TscMVjlaYpo6|38IT%q26)$e;=^VStbN}ur8O+NT`
zx=p4P`G3uc?=a*aPmUkU9FAM-qAkCgm_W}cezW<ghyX1TD~~XGMHchq#DpWF!Ih~F
zcdyedE-L|lc<7<Km8<~5gHzi%WPS9=Yn~!dt5*Y+y7{+%?^J%MFK2zy-DR>PsLK$=
z71utC$h#H)@Z5tpW@Ihdg-?T*#!~Jq=q^|bTnkZcGE6QZqypqTO7&_udq!=0WSMOi
z7ceD^XyK2bwoNeW%LVO;xF^iQxOsQXgzmFTD&5WgOZ)sd1SeL8B?GHLDAoxxQrz`G
z^G|P*)o^#SOB})W@_lB>i@L5VwLfoBwCx*BzS7zlwK>B=py8iVi8$<-N#h&{sz-Mt
zYbBOASdqdgi=M%zngPK39V&b8v>lO3^JCyD%I`w{${04!Z5ALrDth(pqSIpw*SHO>
zZZ_o)$&7^VwRag+pk$Q%SIc<!tbG192zPJoHP;A%j;Tk1KU@fS5FU>TdVNtuukEns
zcUnT}lX1JmNh`mrBWq?1S(#vs1z^-GHadn5iT;#K!BnRO`eG5<N(2eay@}m&-@S+T
z#V6-?wUOd(L6MvsZ+<QFj{7?$r&(wkeN9(qh_(JGkFC5J{M{<kBVr<fFiASU9ZpY3
zxmGq`2)E5)@J?hTlGMG<qoFD~DOZ7e#n~29%eA_BL5llD?(w2Zt($8LgVjCw^o^!P
z-mySS)>E_hH2ag&>5(|;o(9PCHkVjI8(3QL^1wc7Nr*pY_f6S97DT;j%N5m#_)r1|
z+L<At(n&c-15Twp-8f&+OuN?^3^-za&{$&qjfU;MR>QlF@su2Mxzj5$S%rJnovxJ$
z)1yCLmnqZ`TL>*6%=Wx1uK;s)Q6b%vre!NEAT<^$a10ym5;bvi94_?3Q`7lFS|QD%
zp#dOPTZscCsznwcs5lcZH)guhaRrz3X?icCWOJLxPN>Vgd3pBbrqE=6+gV4y7oZW#
zjA1%dv$TUm7otg3cgG_9E;^9<j3yK2m0yFeIa><X{^}X&66HEjhJG0{6rDcqGtS?r
z1^s|Y8nd@&ar$C`9mHkuVcV=}!3YD=I;6qdWBr-5z#~lT-p2k<8nQlNI=?dE!jFMg
zb@5PVtCY()s|EFR8**)m3IsP;A?{$$bxzz`Ja|OyjWC`G^BJw~onx0GoA?Y`0jT7)
zr-9gK&buBTY%ZsAXT!f%D|+p&q#To0t2ly=dJHC-XG9)}!Nt4{Nqg^}S+w4jPGG#z
z@iQe$E?xO`Nr7nc<}Ka*(}(BCi$?I1v8_#E%&z=DapJQ+;b)yZlEgR-LR3eEQt-b9
zs$0x>#~Usf2X!@_cQW-W>*-%&sBWmnU;|5TWNd1J3JsIwhVhOsm;pA7bA&Y=##Fj2
zressO-*VrTCs2pmDviRuJ=7o_1r8i(QejJ{J+g#;7o36T7yQ{E8JzAG=EsxDyrgbz
zga-OJm#g?Iz|7p5N2aHN*XJyOE<!OCmHAlGU{Hl~-XU(p{1UH>=R!aNL1XP($?bjL
zO4M6+g|AvDsTI0G4KHYsa!<i-)h{^*$v$sywvM@w@S{@uWPc*bCp%Y>);O>7TXk>g
z%6%y1IR(N4U)Y-}R2FKV>fJGmp__wqswa@fv#Rs@sdTj<_^5CTi`9xd(fCDlO*yXG
zS>Ou+*rVYrpI(deQx;3_k6z;+pZ2U}mAr5N@6~l5z6U*YnG8P}w^DzwWh+Nmx<&YT
zNBCoXulgSV(9_X1)YLK1)H5RL>0=Fau_txZb#$>hI@GrBr~e}m6ykR!;QId#9HL)}
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
zcmZ{nS5(u>7Ki_#caS2zh|&cjRjTyfLFt5!2!SBIX&?%MC<hH7mlhQeq$4efbd=tt
zgFujk-jx#S<(#*B@4DYwd%it0>-RPfdy*{7^yz81XaE49H#E?(y0XIG#YAzn{v5B*
zyAqj?rl}?XRHxFOxshM(1w0I_OaUND7y#hU0N~{62)+scp<n=5cLf0DcL2Z+%fVQx
zUR_YQ8|&*_`3j;o_UV<VVFvcWS9blUcKx)5t{Tb^LsMPKMRFc?Sy67A*c||%BQw;|
zw27G6nu(0DA)s6L7P4e%4TY(v4YV|v!>CxN$*1Y{$jH(#RUNvZCV^ot+83gz$C6GC
zmAJzAGQnb9P@$I4W;9b8v#G$X8@Fyqy!DjHI#50TxM*EUE|^69gLomEue4*I_gj5M
zDR^E<IwJDF8K)*ZkSO@{H!sIRQJ22%|A6Et=tIVN@yqIaom16y%%yyw5WFjpe5^JN
z&%S;aPNAx0t?}>~EpSvWjfK4K?k;y!4EP#^t*9V9yCy>9h;yCSg=f~Ga{#?ab(>8M
zs-2G{3^c`*txs(ZCUx79y~)GF0K2%jt8Icr3rTw@0_okl6!6K3ye|Fn?Y1FmGTwAh
zvNht!9m>sAJSx!z%G`gwPlppovCwF{Zy$+K*?nAAKciZ>kt8m_Xc6(^8vGu&FV$G(
zs#hw7uhm|z2Lng`kEeb!l)li7%eG^_GfBa_J&o5>Al&USR`9h$=L%}Ldtcc@s%L+R
zy#?8|S!oy$1T_fcL7Bz-fp+v&O91QgE)8xt!50cANxE;OK~Z~BKy(_GaaRw7k@*`s
zylJ}kQ1hZ03HZ@bj%~R@uX_chBQS$<<2!<@%8+drIXdL45+7Lz;NU0WJPYt2I39@N
z-YaT@ip^b}!^028U7n+p3gumeG}l2}<9E+FcRLT1m{hLu3>`&PYl>LRC~R*AfZm`9
zC9xjwp=DN{Xm$)8)dl}2KBO7H-BCF}(9V}O-o(We?;v;GaD(d&Uk2nX^iI!v0wpYp
zp+7Ew#;n27(76HmPlw_r;(?|CO5#uuKfyRwU*N`OtP(Zmct|)Wf{ll`XZqoL{Gttu
zIbNaByVk!(j*L2kEyKe#rgG$a@geTr5{s`d*`rePloH9f3N`<MM8uiHy*?%e&mOTm
zAg-n<i^(~s;LkZ=-{)D4k9fsMMXH<>&1@+?kJtU2rtclvHaEJUFmmx*2^eOm)r?db
z)zdm3&hv6B!SO9Rx%L35&BuJF#;E@FS*i7#qRIXFu*I7epBlCn{JD=kb01|*P-!hY
z@O>0%yh*RQ9)LTl$x(wdS(G398LyRNs*~wnDG5JCpWp3_XQ4-W{2Fo_cA12vJ;7yX
zzwL$X{z>I}qXw+|{F%qEF+6J6x16?ayH>)HVyvlR@Z5~Dd6c+7CrftwH?+iC+j4hW
zEi*GtN!=rDh;LXX)@+!Mu9~^{D+#j>HAyl*2GR-ORKXYD2kx7_BbVY*9jEea{E-75
zR!FiJjvKOkJ5a@W))y+FN_r#OU_xBm7L~1L+rmadLnFRF8|UTyFb$#)lPY}61xkxe
zHb+OtNlNu|?2EEG)?62h7Wh-MRyDz~c}IOV1)}Y1@J(d!8|n|PabFm<Bwh$l_}P<0
zOS&>JQ<_s1l%&od9(8<3YAFr2#c20<7Jj+G<*f#(tOfJxRqm@;AL>6;QjH2Qk!ehD
zaf+?s8N-`J=jT$sI^~tiO9r7m9lZu9XegRxy=99@rDCd~^v^bZYtfOy?`BT&8id=E
zR`!Qf@(_`MYkmLPBwHA-pwVZ2IFLS+egP++9l#a@@FMgBCN5aSO-dd-FFAUAU*>&G
z*@=j?m>uP;OP#(}|A=CgNTUGseE!tznf8;J3xeM-ff=R6o=XSHX6Fyfs%ij_IY9^?
zNY>GDBmtTf5Q+_7sQf5^cR*Cmm?ti0v!8oskYMw2F{=cds{Zu3lL=hPc-^E43LW9p
zLypQ>|0%X^m(EhuGPh9GyI7;{!rA{4V7opmuq*qGqOJ;YXV1lto#l9-FVC8T<WXhA
z$@AKTnm*%C(0p3c_y=K*D%8lV@2?MB5Myw1*(V#c{R`O9T|Y2mjC^S*u$rk`YKql%
zU6CqPX`!_{V(3u@63Eq~QzToz*a_3Z`5*9v&TT0!k_j)|V!S_ZDWA_wP$DEVljH=a
z?%j%aU?##kT}2n{Yvlsvjv+}yNmx31-ce;Ubt)mp-l!=v?KZ8A#EBsdq7f8wjqddd
z_o_pI=G5wlNB(Dc)#y_6>lx65q>zxVA*xgFyFL&yyglT^u#c&+;-sx*zL&+w+QFM!
z6|5Lo(G>J9-8~t^@zI2gQ+&gV;YGUVVcgcJUwLIYxyx$ibhMaVeWjsOHmJFe*__7!
zq^+YtdO2#byAr%Kco^6H{ibuO8DhVKke?YX;M&Ywc>rWdeyPia=ib!<(LPOU@8!6#
zqogi&t2;7JZ1<`GkZiXpt$vDa1K<R1ak}!>+7TbjPGBo9G|QXF#$<Exd`tD6_5kI8
z9@TMo*>NhFbG#p_l(eydbwJDoC>l6m7&j()>un^*2JCHX3?Vec%8|?P_xsY-Se>o=
zQ<3%q(Ew%|1KYhdRaW2C8kQQ`6e`-dJtC3U<T^ic`-88_!{Ep3DLzr!!|2s2VP90X
z*NpoNJ#^vS*>r&>4xC^{T_1lMNC?c}ejk$?P&GmB<Wu&<YYkPf#+*K_!Mw102SBW2
zzW8Zfy&O5KAL*eDPX&auB41Ghm^uvjuStm+TUDxqJWFF6-r{=H&4aEusLgU)O59&9
z2d$Hd82J3>q7vJ-s!rAJN=CdMFJG7^=`nQGVG7OEKGSeqTS$|@P@hxNh6<^VwOS-8
zOx>=P;zoW~?btx+hy_aI0+8OF<K*nHr6O^We)M4Im`6)_hXnA*&nt<JT-`PP1bo*A
zUw)f|k*_W!c8wX<w6Vh8$aNe0=Jd(wExUTWE?!7`3ip+l7z~F+N1-??O#6w!gQqyN
zCYU-*`kC1l7>i*0GrG5DLS{QzY9Bd-s844xqPeTs*seB$dWBqi7bn=;*z~(tQeGCu
z&`15R#qeJW3=rap%XtpXHsTE<l9)j5YKQX5V2yWsS(3R!)jb^@7E{BvZoVc{GD;5H
zsoLQ27PZgV(@S7m7t+h2UZ5@#(eg=9zTv))yU(~47yqIlb8s*oCDp{Y<4w+2of`fp
z0T&*>l1PLTKgi6=vexnxRda}TxDexi53&ya5D!^-<(&V_`jWtOxf|QSpLl!hah<;f
zW0v)~OT0|S`yA~onB?Uw@{4pF0XFliGqtTr^sD|D9hlJ|OCu1hYbO3w1{8AVpn;+u
zk-Rf6QxQPQhIP+a!^W??{OaBFR^U(gK;pL{ir*K-$3;V0u<RQr??E`FM_cyl49M`%
zqm2_=Ldr&lmz$-%%O$sYJGyX#x->|??-vhL=a5U-f9H-7zPmWmc=oKNdt|&LTVX-^
z@eeico&s4xbXT(8b^J^Goa3QZ52>I}*x6xTWQkznN*AXG<^_+m^IyY@wcYHo`gPC)
z)Qj`?f6&vsPZA>hddj^^?w=p@vbkUE4a2fysD-HtrdT$D5EY5U%I}^JgSSUATChM5
zdSkh{iv8?&l%9l2E6<E5_UOTIs>S&$Qn*uih6u@-J0;!P!Bd<G{oHN|ZCT+0S!RaT
zOWTuGmJ@gh<c}ZyN?gX`^s+rkvVCr)Hz>>>d6`mZ8GN{BBwt@qO*7glBy}yQC;W}1
zpt;`%p|dZ<9~BK<U+auKk6t3e>Yr%f_luTtOjxQ-g0pi~bSvb`4Qk1g@h(R8kv$N6
zpF(Qgs<H_l+m$Iw%XdB>WK{|IEMq;-bj?(5Z!C1q#<^}K?!v#JQ$ofu<7GEQ*K^|@
zyW<RB^A4U=(3f^n%Be;3Rvpar2gV@nB|_1E0eSPW@9c7tBc0&4Y=(%}<rj*lbCqmH
z_?FuvI;9(OHgma|VAG$!F6NIUY78E{==OvrPn>s^V!hdlSO-{w*sk-V6|{78-0?{}
z<-0{cD|1=WJeUP}TN-}eWC$7yJ-Q4DcWJLUb^E32p2mD_Z6k8}i<3^hF~;dwadxZp
zY;)0m)Bc8_*PC0AInS0Bu>9e$<r0#=pMC6Vq^yD*eGU+I70KqosahWgw(h1TUXKDJ
zR^T5okr*G)lU)jXG<NyMg~goEW*71)=gsk($q5>_OCwH2{KGS`v?8(#bDy2uIR7D(
zw<7a@u;nGHq!4GhqZFiOuf7OEA-Z-Uo^Byt${vrst^~+{?<h)w<t1hA+Q`T%%imF!
p151GKD1*Tf?F6;|2tWfpeZ3?9e}FpQIqoU|80wnoRA{-z{~JtzP=x>h

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
zcmZ{lc{JOJ7RP^tgorI##8Ro+s@ld*2(gtg6jh^^+Lh9X2u(^!ELB}B^`26DO|^Y(
zw5n)CisGe~A>-L9weMRSOOLfo=KVA0{qgR(_kQkjzUTgVGhJQm#i0sN006{s4z})m
z8vPYgV1E8OSYOJA&^0S(D*&j;7CQ(O=J&{82X|)xxTOIA)HDFt<BzC|01$@)faL%H
zKo<aj9HF?;&78jg2RYf>^2xVd8)h;eq6CL4v3v&nH+YfOef$DK!a3VPri7K`^tBW{
zZhz+s({Z*|9^}zAZUVt$4#8gkp3wX49g~3-Iawu@M^Jp|fYNKzLWnA#wKH=V%<&??
zY+l73b0<Je>V!h8$dO`CrK?JC?oyzR-WPSp32F*6=^}8^XU=Kj(j<5fhFMfR7CU}e
zG2mSrQ-U^)+(<g)QuMBsX*Q2-`^p`&bNkynWT#gSTNXBV6D>}!;Ysg1yZ$n`e<xdd
z4SerjSNHw<YbSzdU;WFw=IK*aqF*i3YOctQcAIU>QoHB5{vf=bIp!AF;o9*6B!&rf
zk!0bwbt>DXGRSU_d;>FlP`?IK6CrGkjhH14&@g4*#GNnpYo%ecD<;E^_DCXTxdpCV
zTHT%*pRK<UhmEz5oxL?cL(qCzW6`6S-f|1Ge#7-sRG~09*r-dfK*C%{;t!#%ekzEQ
zxu2*K_+^YN6kDjokdF%({9XU~_*VW{EzCMda8eZ^YT%v?+QRqAE(vdj^IpFI!8_Z8
zV58DhYy<O0YY%VeT|&g{t*wc-6Ml<JJT9ge`R_+gA|vV(Veq?#z44{A_v%g!LTwx(
zVd0HA6MJYe(2i+Qo>u4ujVZN7+}unh=ZM<;vr^(0?n>h@Bf-n(DC%YHqCJ4u2o~hN
zkEcKjS~U)ko)M<S!m*J&jTjO0`}+GmgQ%A~nt_qZzFL;9l{aYE`6VG1WQ$%}*3HG@
z8<L#BoOYXbfmig97*kH4{UY@aH~-nD75{jl*8r_k`-|$#otl`umd7dA^SB7mJT5t_
z0J<RyEsz*hy;1ZPTG8ySK8^Yf!Kk&KX&E!_lo^KvZ!ZjGbXBZyUdm*-5Y9oP^Tb*k
z`?aMSQbr^bMfN=VbPJ)rs`xNKga}sVtix>{f2@><8hOS8!6wBi$7ietmW1EQYAE^e
zh>HSJ>gO_agd=ahwN?_?b=$$YK~ATOX)1^zi%0UbtFVq6pFG>Blm3ZvTWG1JteYW{
z;b$-ja{@WZ`eB(5IdLEH&t{}^etjaWDp_#erC)&LD&ypIZ51qAj!@o7AF<c>`i`(X
zz6~ns@GC&w*t=saD8Tz#5;Hz3GS&1k($>Oj6J{)FwU}DX@YZejFS@PPBop@S%O6}H
zXx5XR>sO$y2esP~eO8wa=T+E0QtJ9gPJM&quE;y-yLS6NT0PWEysQI>S5P+jOxB=!
zE;c>zBUDV)C4Z<+`F3%ld7uVTg<)0b=ZJR}ZK#M}PU$g>E|>e@SL7`B*<ZoFL*ec6
z@28qX%f9Y7=0=`QB!_n&i#{$t)ysUZKiQMX{N)6Qana}z*thA|7rGkx`RyYt@8p>0
zZ)CEC7;V~`%Efh}wRFFLp<T`U7pDfchy719L-xiaVau`D?%2njb1nDv9F`Z}d<Ty9
zA2uc#7C&KBpG&eVIKQiCD`_&}{9$xY=5vXs`jUUsM6xoe{U0OZtJCVPIC*O3^aWT>
zHyxY{da!`Do@ANL2*iq#hn_cIw-ENGcUztI@&mbaVPC~XL<wz=ZfV!Tn!5EIdju!p
z`6z%`80R~iSo8C!Nu@@9*qFg`S37q+zBHo{hQy}*DC<-}bsc1fU&QurQeKG*j1Rm#
z?WtgJGrDgJJn4Hol*1Cy&>W|fPo(v%UcMxlhl~ik8sznfQQL=)Z%FN48xI(yk_r+!
zBn3*2`Bb8HNv6v!udQd6I7CGVE<`pEdFl02n62*50|j{hyECajIJ{Ao=2+y^4CTBm
z`UsX))bW}CHmJAooQa}+TuvTh4%_rkGwfP}q`>(`pq_xEHFJrbS!pQks>R(YOu`nO
zF;u0NrP90k_Q)_l<WmcpQtZn~nzhhkx9-+2T*Yap9Gaf}&-)2%V$5F9t{Q=LaH12N
zUU0#T<l*6ea^9x=XO9Y<+p^N#SStH=e9iLY29<5AcO=+|Q<A35T{9|9+Vxg6GmOAe
z$+XI?)M8Dia1f>Bine(<Mt43C0hqFz(hafekL8SV>CNpv0k`#djU24fkji5^@~Twa
z0}vzCaUO&tulm9*@hhdA-J__<>0o>pZ>NzBtvtN*BQ162*68Z~>_b&{hV}*J5jveK
ztK$>Bt#fKZMJs5(Vf`+4Atu>pL4(Og2v<*XDI#o2+4yX6^tM4|OJF&gXu8Ke^K#=v
zVZ^q9qmKU*cW{N^ewLf1@jbWPB>Zn$_n!XkM!Uv|<!t0g#`Ajqk5VVud67Z_NulUq
zVkjSg9!l5vEXwe#o{5K^KH5+hZGbw1(nX_C<WF;${}J4X4v7e({C|OHnIDZW0C09L
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
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
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
zcmZ{n`8(A8_s8EeW5!rUlr2l96l%zpWX3i|wwkP=30ZHl%~-Mx8DtPQQCZ7YN=3+$
zY#||g$&B6DZu`E)SU&F0Pv7tLy}svho!9fc&bgj{z%$0^mM(%_h#dd`gub4($+2Gj
zx4B`*?{Hs5=CQCiWARu3C`sVhw}T%4kq&w$cmN2J007D(0N6WTQDy<)fgAwL+X4VO
z6#xWCFRF}Hj}I{W8@k%ZdR)7>>d<3hBkA4oIab^M_Ntp!_wm5$tB=3VIt~>PP?Qoj
z3t0hx6TJG`ShIk^rHnwU+kJyAU){1|zDb9NM@NT8=Vog;rKLk|<*97FS9yKMIH2$2
z>*PI~3!iG{7JP+o_LeQ0Q&oI#Oe>)p4BuP?yT(%(j~;i-kh%uQBO2H02C{SL6Sbc=
z4rWvqN@=6aKpJsHNtG-{8gGo`5V&kr`9FqS8}6?(r0l<C*tX}lnV@6&Z>9c8Q{St~
zv>mSex<CDAZI5eGBdgqPrqiu&zIn?a1T#B9Be880bzVkkTc;%zRTL5ZkC2u`tJ}^E
z27U7(b+6_zNgD7E|6NdJmae!s7>DStw;<;v9z5V*j64&A5y;G6F?!fkeu0QDOcZ!I
zU0SX~?;ntExpRas>}ysTx{h8d541XLqH*l*Uhvl`7T^A|?3uR39adNYxsKvY)nsNW
zia=EotD8jR7A4c3+wM~>QbE*>Hu;hhZK!seB3hV3vG^%Xdix&{%BNp4-GYF9sn=I8
zp;iGWH<^=;RfIRsAq}}Q9w3aLJJ332s^u>+R#vwheurOR_Ejirg3{Zq%8!dMf=V%G
zoKkiT=r4bT^0(vb(h8ypjdPvZ-H|J?*$Vt8)BTkYi>x^}z#d_vMuSMy`XBY;DUmsU
zM|l_YU6(baoEntMZNzWPC_$95s^ruGzOXd*YZQ`e7G{Vj_E6+$&Q$Z(1OASwX+@k(
zrHq(sl*n@f;PM(fAH{gHkxTCqH)Uk^{P&3{U{2Cv5?I1feSqNf7^lZPkGEB5mh{Fw
zW2+vfrVjbl*KR^3x8?fscby)u0Q!EHuI<5ak(RRV0pn4}hjPB&%UL!3d|mljZ`@_V
zdrOmHmk}(?{DNpJwNzAyMNlBc{Gwm1gl2h#-Uh5jJ5&b*elC=qWUyE-v3r3%+NX;7
zAPWR$m3SiFr!;7QOuzDl2e=muA~7oUiO+#%3^H~2eVqh)B<W^3ME~M#;L5nXd;LND
z**NIvubOC}<K{Q^^R`;7>B`-9tQYiDx(KU-j_x0?P-Oo0h;Ub9EYW}KP0Ozy^+Gax
z53)^PwA3QhBVO!yzX{$|ZIX?@<e|VuG4j*GM_w5C1dTiUM)b`9qxPppwbxbcjs6!g
znt!I`Pqi36f~<6Bs1a3ow{I;y3ldaSjf)+z$KK!}$LZIT38q`(*-6QpP>E=c2~^Jo
zlx#1ryL__gG=}n_E8fH7utW8f<GZdKpF!7TkEF989p}s*c~7Q&Qj3||9~=pl<hf<>
zUhZrd$X5rDEYB=s8K|_oyX1*fKChnv;=K~0Ll!8TV$cYeX8EJsjZb0k%zUO8q>dHZ
zKiE2NS<~*_R|Q{Ofbchsa_odGRlI4ylJ3px6~sjRxnS26%uY1iBd?hYFZNd~m4+68
zpQZ%n1R~+JNrjF_!`7djs%}@^Cap|A6EKy)?lZbahql?w%mZs>gu-VB19Z3C>k9{P
z?lAP#m-)9N76ns1H^SJ(5{#2&7^R*8Z|#=qEtG@1#n0Hv?i8%5BHVjxl!)1R0lGDi
z{3F5+ZI_J+eK(S*nYRyv^q9?E?hY43*-V35UFW!CfwSnu6N6w_F~U(Vx*C0kvl`s!
z$d~WOJhu${7F-w>AX28@%ofa6y3&^E@r83hHc*>M#VuH4cM+15r2E@XuSyLp|CwFq
zW&D_rpsr;9m6-B&hy=HqP{ZDgRL|Os4JHY?Th`efP_d+hF}2~RT(qCbJjp!B^=Fsz
z*jw%SOY2MOB)+AyV&&BcoAbcVy+gm{uJ$LpbbZBYJZQsBNm2S~*bh%dgtMl#b8%W7
zWt~JOM11ES3Ehn2$;*C?a{ha1+&*FWm%Hff!F%%*jONsw&fF*@FyYlrcBIx7QdjJ{
zuJRsH!ZK|*l1K1;Sz@GSY5G6*GX1?CM|u7AX286z?Sfd9Q7wn>MdQ<i3$1n2K75M(
z7JMymML~_9MUwC)UfGPeh=C7ZJDzYLF(14+G{^4LT71V-c-RsypYZ`1!0xfhJY;Em
zFQc@LBGoOFM1T6hfScYjH>3uPc@g8R5V9L5i-7hDS*Gm(%e7SB)wBqGqtSwz>wz3S
zh~C|WeXPDw&?U7T>1yfX0;um;NT_29(XL~+#YX6ew=DFZ0aO+hx17BDE`&>Kje^rR
zCq}!fdwIEX52q*xFjN0}lDX#Cma6?EhwS6u5l#V3pm68Rn5&6QciWul5D)Zh)>h>?
zG4NddIW#y?svpFMvp!!P(y(lP(h<~3bQf(B&Q|TSkKdF3v*hyp?iYcsO?BmFU8rfL
zyuR|O;I}akX`~(}D1v4K%_};o2{p@0>E;WKm{P-(NH%);>q>fX10?|SD7Z(`jl(Kn
z%4FV&wO@L>dg*P$HG&3yhrJc>%6b7(Fg(!1aP~PUOu9;dGww9rlsbJ!A=mLd=L<Ax
zzWyD<W2++QZo^uMcxNK44ej*u6W8LATWGI3&;D~tD<uc0X_9a`2r8o18iL8cI}9c3
zOA<MHVUc0mW;UOHbCFt)witQ*@VfrR@f#Zr6+`6OHN>^20r#s`F1Q4$OBMe)MdB>+
z>j^<Tm)Vg>6V2Ahwn}cn!i=P~0I|nE`<!g6t-aTH@L>T$v1Sb9x4y&TQd7$@^%-Pg
zs99GTVzq02R>o(h{*do5V)9!<%@6+j8SD!BOzqR)+=%%uICoTegFQf5)arRa=XqqJ
zztk_rWzT|@29t$#F@>kEy<aMw_T%RNZY>5;ZO@2fj+0vC|D{Kv{HDw)!FJ1LFrS$b
z$ZE*>eix!LJJN^GBJSvcr?gQ*5~%I;faM%uU~&iRq|80T{`n;y=8;*|=m);~cPzVT
z3T#Crp3XlvJ~D$5$yDdM+)OSb3W9?|WpGQJCf%xD!W#n~8g}ccX1m-sclWxsEnBm!
z&4%Sp*2Q;z+Fpj@Gq0M{HvzZkcO`am&kna3rz4cjd@;grf+5fG^}MW}VhTnZVUbzn
zW<hHG;#!4(2aeGrbeA}!8J%&a`rNjRpfMWl=nJ=ssq)@={xLi2wb*M7sL4|kb~#!3
z6N;fwU5@zqcp+Q18<t?sD~MyTgQI1&_sI>k@5ex&v9+-{fu%xT;3guR+S`+HI}X+a
z|Cn%jrAgtxSHLZ!_?2g){GV<iT-Bst!-Hrc;V#V|lTDRHEIy#90(5Jq*O-uN8157~
z6|KSX&<#;!RuTDvfhwIqN8H;EYpgwjgoq`3e?DQx|Cp|Z37?SsprrQo;EB}Z;v{&5
z#rON)Zo>&Vol=3YT$&YOXV>OhhOpPCQ0aae%BLLZGVnc_l&jH0+sO6e6vQl0-&Jdd
zV4H7%_Bdq-=Nn>6@x(M*L&4Ju`HG*#)*}Mtvh3_4kryK`+L|s-E>2Q7a&uhZzb@^x
z)!M!wTDe%kud5$Zx9T|j)XT6LYv6s1!j$B{P=0piE6-y+oyC|GqLak{pU55aj6N84
z&Uh%d0&5&g#ML3F1(CSlXDLhrwLQ~%&Tj1pD5rIqAQSuKZrbZ9Ef-d&?no>6vf0NF
zI{TuH`u0Cx7#=4PZFKC^DW!$@AWBG?XViW5X!sWs4w%Sml^y@DYq<_mDV4x4J?bLI
z9yRyvL)Oiqm;UOLEWx9OM-*pC_+eQAZrlW}WOnn5R8Dhlma{sWeF5S10~UE+;!pTu
zns-zO<QwJ}E~q~I&<0maZOlzUC83h+W(1s`_1Offv=?oBqqH13UH|Cd6VX|h5t5Uq
zd*gGmr`(9Tb;id7Es>Ci?uLc~hdtX-wqxTtWa=_#=ceu>aqz6GtAi`VyZoRg=!|BZ
zz~5LIal$6c4)b?nyv^$Bmk9DG6Y%RkQDh*<;*YO+5h5+5btXS(bN+084BgFB1u0UH
zVhFKqEL|RX$PBl>-T<GFlbn(;diz-A9O&6{6&ux8ux7u%xo|8(M0Rklg3@WIF<b*Q
zT|8Y70uNv_{0Z+jsot>Ido0HTi#LB}!ai|%DcX<4hWiXojjBbyjW>B}>!j$Gu7tSM
z?fUo)5bc}DwI`|lUJu%0(D^#ecDVP|=Y&zNm?}wd7QDtwkk-=2q6Fd!R+V+P5#-&z
z*=M4(8cpi0p2M~)@TEPbd^Yp%6Lmozo<G#~sM7);sGL&{w>sAxYs|o4OZzwMH1~Is
zJ3X_X`536MRj_U<;+a^agOV6v$G-sT@pK}Z&m@q%wH(Ic4)d(iAz|QLo~!RQFXw^A
zk@!Y@2>^O6&!b)DUW5n#WC?A=(z5L*qnr{7{niCaW_!ZiwfJsl*Z$DI73N<q#s8gj
zC^o3`h36`4NO|xVqrEVGMx?vp`4x`>D-e?WJJTqh1s?dS^B|G<ZAc!aFxp00hKhpi
zA&gea*Q^7EG%xSLQslHOWkkcx*z+#w!}<tg8cOh4yOsdCO?bl35+Ik9NNEa>6jR{4
zbrdP=Cyi8_MJ0njH1*mGtk!fS3x|oS%8DWzSF_LRVT9tdP(2@!D0zCoWCCeky8q$V
z;$pvtpGh26WVayv6Sv)xd&2KR)AtKMszvcb9K+VwxWyYpSlz==Z?ObM(@u6_Sfgdn
zGISvn;!uwkDu6}v!^JRVnCXGvA1+$fpg3YLhu;;JdlcbKJ#{7nOOB2nGB`AFUX*aP
zC{sc1Q#7CSY2sY(u^fc!(N9?<rKFg8v(}}%Iy}7kJMk`^Mj4VRt34g$Y|>BVQgcz1
za^h>Ht@DzRzAtCHAfy$Mf1*$JSm$NrcP`$OfcnmC%4dq<5ZkwCTE(gbd$&bd^S)#Z
zY@BahCWM&-3f747W!CWPEI#=mwI<^=hhamj82(n$VclT>PBh-byL35U+=J8SL*dTI
zSsu?wH&7-srd#s<k~CetJ!Lwg%lmZsz?x3idKW>w;})iX);3{45$_T~UwJ^-eYJ4d
zHDwA8RQ_00YP<0@pw!u0`+&t*x0zmIJ#(B4|B7>6YsD`tNcXpx)(xq?zHfcEy3$(5
zBV=kiqmO<^?%qps@EmhXv`Z`^8?%;{G5<=5?nEyyj}2v`za2bMsbpa)f7|kZb@X=F
zWpeTVCeg<0YHNmllY1?j_tFcGBl88{>z2NbcD_z%2XCii0Tkrqm1X3VWE8HMDJY_q
t<k45;P;&BUIk|wwX|?}l@E|(g|10qSH?U<{haDRL{p+{1KWf>A{|EN%rAz<-

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
zcmZ{mc{J4T9>>4T##p0B)`(Py7-fsGrLw1NS;jVmkWqFsC?buJC4-5wucJ|xL6p))
zSrcY7{48ak#yZ^T{&nxU=f2<P^Sqwry#IQhbDqzAYs(9K@FQ>l0QfGN8QZd{`L_h2
z>~VaksgMmY8fk$9fCfCzE(*e4%XpgES^z+#0svqW0brZGg`ER{FjW9pa0dYGTmTRa
zCbZb-vJaphmoFHz$<~%pYaAQg!Df!3Y`XuuR{Rb7*b^A$qJ;@;3L+t@t|)F7vkU<6
zp^L^yyYR8au{gV{S0~@CZk(T;{K$GOfD|^qJfB1JJ!U@N*kdmI8LDt4|3$@Nn*mbZ
z?)~TG^vy=hAnyee$Y80ph9HcDP*Nt(Hw<>Zi!@y4){u|mkiD)l9@RJ5C*9SbLMR;4
z_=qN~Z~s~f`_jBYU};57P}-vsdcDr%nJZ-eCrZUHzlc^m{a5x2rquNLR+E2=8@0v6
ziP2#K3t^(wW(%tZNmB0nmA}FM#1Em*@gZkN^|>RQqQJ?A@<XssPV8rfVvFGbpAG=0
zo9a)0HW*1wrN(uTYhrd1Uv3m`lO_c&Hh5RwI$>uS>+#GyNvASNqFxfbY`Agc5dR)*
zfpP<!O!m+zK<buhy@K>}83S->pm;GTH};igK}AmL8P^0WY3=5rd@g;xmNl}vJ}xk+
z6<;gO`!&H{pg!ncdc{W0FB4kK2R#ciNNg$=>5V;n(w3V;&E=QjIpTo;=qBB7Ai^{&
z#Roo@Nv=@>YZXsPtfM~Vgu1o#^Y_$Dw9iCC68j3pQLH1y^u7K*SKeXoh8*(2bc%Rc
zd5sJ;gj$)63%6?<lyHA0M$@kiL~Ava;2NA1)J2U`xMt7yQ-|8!<-I8N>#VAnqdkam
zCma6bBtlVS9K=O#U>So+Oim4@HfqLuMi6Qvkd`;cD{sd?TI9FAjC>&2=!b@G8j<rb
z{RVPE^+Y)X?<yV%sGRe}TU31uBXTl{bRW%00m=Bh@wAh;`)T3((W%phA0|UKlK5~2
zOUvE|kt_xtefVbiDHUB`Uhqbsyxg>pwH8Twh`9eLPqvifWy;K`K~45~70y_dr$8D2
z99%QKGrSKQiOXjljt<SB>aIo4_rxxNVjka4##l#mmZ@rn^*-SdmhtWka@9I3IK8yp
znstcNUU#$lkK<hUEaCjH>|9&m9{&%a;P3P(zg3y#077{aw&C*xlH&2Ob9tR5AZ;v&
zeDScY;n+`3t?OYU+1R;mlXwGanaj_x(Y81%=8#MOz}}17Ej-baTV`o!wYgM+CJXJp
z92!)xDQuiVO>5GFyPTXYBGqu(2S%fnMZ7k8F8W|c?y!=`9&h1;HWwt5XFQr6_)$f7
zV?>x@<u^~-#qvewdRNb&hz`|*eJ@@2wz>~>QwpBW-a|9gPa~Oy1S5pMfkdOif+OIn
zbH}K2aU=G5;Jx?B)Hn}ko`R7tR4-?+O3?12Q&9R>A1u{tt6i7@=ottAazkba+oPWg
zeXJV0VIcj(o39PtQ#0LiJA_A#jvDMvZ@yiXHhjEuYx-@C^&^b-Ow}LN?6*N~ia1c~
zWjCgIV)X&P<-|T<N?4A3{B@3tsKN+NPQKkR6$GP*j%LTBJ$w7SA%o#OldEV0BTVnH
zW{6#B8@@8GW52U0s00M#?@SVqo~vS9-L4$&KD71M=`T+QxlNuwJnZLChANOLi?ZAx
zETvP<?tK33wYflV%zF&yYP((FO)5Mg75^D8Lb-(iMcU~{tS}N*B3|F`?Add-m`{H;
z3oK6T44J!oct-7U@!Ri07Rv<1&g{$o@R%bY_N|)U($;$J3`8b8@FP?=VOQ_{sLJM?
z9pr2?044;nuZP4Zdi6`2<US?91gwqt5H!9&_acp)1>8QgX5BeaN2XNWvY)B_Fw7*j
zAj1+CI=M9C)7<-W=1(!mv?9L;>Iyh=!qOCw1u426zGGDP&`R%4q=;AG#V9RV$&9Lu
z_yjlT&l$H>kkN!&I`qMz`4^yf!mD($AFY0)kbPH$g%@^uORU#tC+MvFr)niimL}K_
z*B;w(;C5k0`a4(iQ4h#ss4kV?UHpkcmlWTS@&3{yQYmYHEpz-B+t2<)%MB+ZJYJ9b
z|3)yohVZqqm_H>!(No&r9EZmkE}9aIBp@}cDHs=GQ;XKx)s92GTu-aN997q{7e*@&
z%`3%?C)u`QQ6AchSd}n-#Gy^^?zn~{5{=tAH+~#ltMH}-AOuNEkIX4N<(J%=wZX-8
z^)$|E%njwR{a-hPbDxy`QxQ=UXrEB^dI*p%jm}*|!2{-+*>ARxmiO1dwi+upmY0Ft
zmWdIRuslZyKF1*>WqCLw9WZUSLD^wfxQkX2$oVF8Vc)f#Y{j#4lH^&lyUN|O*NjJ}
z)U;HUR!n5tQKeZ#y+lDg2jm9C9@~hNYJiVUwI%h^93yG2TJV!pLd3W@oZPo8h9*D`
z_@xQOASG>M$FcajX6|9xF{Qfer|6*2+-?c?1E~&!%&yE@wpGftuZC4F9OSi-cydnT
zz_!KwhDXP&%&T*o!S&Kj_#Zc^&}6h$jRJ1<?l`w#4B5X%nRAUvAyo`GCX0!P(*R$$
zMyg;ZUDgc@68oYQ3zHFk#Z}mov7e15mR1lui#Yf)FWv4{Cl2>MybfJ_74tM4`pTj$
zh0k}|czs%K#q<tS;Hzy-$I=>HM9IM^;akRwW6IpsmQ@1_iKXLgUswEL(^L`wtHwJ@
zH=c*ys2g;xpm3V>ns}xtMALUB0aLQ(yWi#n5nU*$>zfo;5u^((T_Fj$F=sqHB^|2b
zGmRy%<8OFqA<}xs@CIoew5xGY4P7^qOQBz(d^UEkIh33W)m?w-_)|B);L5s^&GEyp
z{Cw^Qg4XHpsAE}oN!B8UnH{~<Y1pk^c~KDuQ3nxUYbV#pQihOfLWQmX^E8NmVZMLU
zb>QN6*qfVbh6UJ9Q9eQNIC0yShj2KBcXNDZO@Ns3*gg>aYnUk8AgGJD(AsN7G(D9&
zOI?xVc&s&&;@3I%4|Z)@s1}F~Q<nLzn<nZIR7$Ls9{tnTrnz?Od(X9VXExub%NZfT
z*1Saf`JHp%G@QlEJy7xKJ9>dUNo{4>0Sk6;wdI~M2_d_HD^Ejsl0BPr-Z=L&y#4I8
zpp|{1Z?=vjy9YB?*ObbY)QQUvr*@M6*>AQs4Cb^_ed1Mr&ryi{kXFSM$Ud*i$v4O2
zDHZ7zy<+x$*MIEMN*<9C_0f@Kqx#R_jUL^VSd6Y2g#%IPo*#5p!#F!2>k!e<%k3d9
zwu^UexnZ|JPCI^BHW*>=>svFtQ^~^J0+JsYSiS$PvvYQ;&hW#7kPg1fkn)dbOAT2J
zmUxW#)1~WENV-%oUS;cf8@bsj?jYmJ7hZMZerppBVL#)XLQ(#O8dF^5u!;{VKkyz%
z{_;xstq9PnRJS8Xf4Vd38Y9tct?ygM*n`}NTb-qwDu+jA@#jntzj+BS;|gh?4i2b+
zwsEzsQp2R5<D~TOBq>cM9xuRk9-O!2*q*G`IVemC=drZkV`d$PMoZ$$F6pG7gwZ&Z
zd-9Z|V7F5rgL64pC1c=WQdxI$##eI=<-YHETj>bT;nb-sw2{nWoqHNxcb!Gr=YN3_
z0<qWq$N94#dvNg}PldEAWZ;TYF`VqryUsRMtRMf(!d*E^J94R2=leCV^Ky8x{TrXT
z5bFJx)o-n@wJjC)nD<{hU?Mv@iTQjmqBCNZM<G7azU2w1B>>8x`wNf0Pt+;lRIV@9
zaKhw5m|f#99YOoTx1V=x+^p~8i*R!8BFEg1Ao_f;8DYww6aYxgfEScug<9HWiGH<x
z((-i!^}iitT>L)dTFH35;`P%3?4DO1W8#4ELSekMJ#Trl0i01)JFBdUP(E|c?u@!N
tLQPvk^^~fbwyJ7)*NonO1p<S-{Cpz*e}KEl1;-8m7fmdUYYpAw{{?CTvGM=_

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
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

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
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
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
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

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
zcmZ{nWl+@b*T%oJuq-7F(jmR%0)m7r-6_2*(zU?S-AD*Ok&s5|#RUYUyAh=usUNL$
zDE;t%-aY@B=bAa^bDwkOnz?80xnG<&y4osWB6=bK0KjUhO8O6!_)n1GKjfw9uXzu^
zwO7zm0Dzig&<z6bp=PmB)z<=m04@LsivobFhgR4Q0C+<HU=I!e(wP82gUo5xlX)26
zztT`qdf<aDU$lfifDox_>h(bQ|HhHC;^@PH0Hvk{BUr;@q!E3}U>JM|03<7FN(zR4
z3;WsrhDOtOopReb&%#+))`5>!Ag#yTVw~GpoPDgZ-BWQHFG>n7pNa>XImVOQlC*X6
zzYrjb&aw9xVbp^VXnG72GBzgqO8Va40o^q7fmO4IO+mS%W|dx}vezx6%iCUmo(H}R
zi}`Q$<0$anr{w-e0=<!fDg9M864~GFYB_d8{1FA8#&1eKK->z2JKgC}e+**$o5D}U
z{9m!X?2p41Cod9Pa>P1$RQ}<NJSCx%<UL;oGm7dSiuBdd(b2|8R&nslc3vnT<Y?a{
z@fWDnIil?uXy<#81wPm^h?GCZw@ikza`6nhN1x`<_>ohI^k?|<T;lIaaAuLOitE4`
z_l`FMhE4<tqc^VVX>Z_phuJ)%5w52i`iD#rN3`Fj4HDqL&)z+@H|{#d`tdhH{wV$(
z)A%&*tfpfX1=uNPP7quEjC{LKv6GpOeYK$O+%fkcREZP8&Y&EVO^kfb>)JlMSUo5s
z)u@hB_T<o#?HA&7;a!ODubx#E{$JYKF+21#R`x&FP`>uYYfeY;X^X#<!*)SDFgL&{
zYK|>PVT3XR#-__m_xNTh*a`byfR_-&zjJx}(=}zu+1tb!>~|S7Wjd+QDD7xcxGfSl
ztCh3a{HS$OcA}^O{{8E^WrKB0h|jkTW^5Ka+o3BjJtU^2R(t4QUDr6ql5B$hHxnu+
zJi5=~le$5@${t!p1%x-ya*p3o*U3WVDr+AEs$@-&cxLqnh?Z+|mpGl4SHG}Qe^)Jg
z=HfO9_~f2T6V-lwd)qyYYh+#K$%w_*lhCr27qJ|kJ~jgPy9J{!Z)_WLb{JiA36^I!
z3a`B3kN&Y6JT8!+Vu*Sc=e%Arrx-2Ikkx8k_zofkbJNz)wMv=X!QEBSHlNxZ<L0XH
zSMYYopa{6s7W}O$muW*9;V4_e?Bhz*bokq4-J4<AZ&N7Hq9j7Y+yHQe_Z5G<mD(?u
zEv2p+S%la`c-#5lT6C}*FS<qeRx_5bkX`|fm5kU<>@`-6;YZ{Reb0H9!?Wa9O`@a-
zq?1!g_Vn#dd?IsLW65#j`E@=DFw(wn()W%%_^hn+EuSQp=FbP;22sW@xs_;%h!2OO
zyLy}qp6yyKtHtt~oz;saXcp4h;x}GLmkh8TH~#3ceSdoq-=1e`Uu$XHx;_W#!QDxg
zZ#RXn*b7cm@HHsP1bXrHsCG1&27nH^hR*BJbktMeNBWN>My%=GpnRNyYt8u{IHa|d
zx%>5;>{Z!%T<pbGoO8OxBO`pq!9~D+LQtu^oh;*AL8w8paXz>OodHdRf(eDeSk5``
zS6hkl2czHqB9fuX`}1<k*iYw6eTNtWzcVa_o^V;~;TmlPnLC>FWk36r*T9KIVWRQ^
zuZeFQagEJ(AyCM}=af%o0vLRN;&4VCNZEF7sO^16NMto%F2$Jv+-*Hd8<Sl)H1$^e
z{B|uSM|f(SwuEXlnI8kv&~(nL$2aNqmoAz`B_TF=W=owfJ8M6on#9j^MPKAqtPrQe
z3(G*A7@GX};DScg{o>qCi;6LzQD1^o>_}H<{pamOGH0n_CCZR`W^ifD1w+QElaYiQ
zaq3!{rg?OUo;Bp5RyNCf3z-Rzk==tDOLTW7j-cNT!2Qo+j%T1O9d>IK*4g}|f`pC;
zh(cwY)!`R<CgJ)(?NCZVIudWsAn@eP)*-J%*9j=w$GoE|4!y>jJQ3Snwt#VV3Vsx+
z{8Ysmg?DJ?3H|8{_n;yXr)G3pH%9=w8cPnu7M*HCks-f3n3IK)hxiC?(ji`spj7vv
z&_b|eTW-F`qpL>W%FoQWzXE>9ZG_;vRkm;L1>t)#wS9UlTDV)zB|NM@*n+Z;^#e6q
zGE=#HAW~V(Gb>S!5V2TRSJBOQ_F~RJuV9TX_|EMw?JEKp)W;G(#Pl;8s*RN|bj2`G
zBU56%hqceY+S5C$!PNnlW1T6|dBmG|@M~Rf5x}t;cf~Bz$w;efc?WixW+aSYt$VEL
zF)bK#Z8BQs)~!LK#Q)ZHiEfdwER)CnC9LT4+bIf9Y2nzfo3;8o96Gr@BZRp5RPzSr
z-jhrD&9;W2nY-b9`bi{Ju$>TU5qxFu?LiEzBr8T7V6f30uB=sIKMGIbw34W|GR8{=
zUnrLcz{(O#wDw{>IR#}_f*!hUN5|C7xhZrVqTkvHtlaO`GS^S51z%fxE!M{)Pd$qB
z%f-cr4A?C52(A$&Ao+!4x$gk`M9)*#V;g(wl53Mk*O!V-kj?k6O6)Hy+Q``1x)WoB
zq8fMGZNlyK`~LJ){V_$nWK;6Au&6LkA#+P^w%E!c(~%jk%X`NeMJD&X!pbPF>y4}@
zu{td0q$CGM!|Iosfh1S_lX=31pql-b++3RGyTjM}_t_dxzZfh3_J!-|-h;Erpn{vo
z1G)Hx&uA7j&eysh5UjuX_de}kAzwXSfje~p2Se%S91NYZOXB9dF$U<`>k4n)3A~M&
zb3=-?-e_htdb<#<!;pICHRl&>T`l`~b%tUaa0qJd@|0@lA0#NMpNMV5;(n<pELmBR
z>n%@o+!*c_^A1LXEUK7%2?80UR%4=*uenFRTtp5|-d54eh57GRwe3g)65iI*Q^Ane
z-cpuDOt|Qu)Wd=)q#B?jykk1Pn%kO=t9#yzyW_fdkn<SPME=fHEx?@mQ0FTsQ_9N%
znjyaviupzyOcB&7+N7+;VqyM%QCWsW=(+f6lm`~^{M=~-E2BI#!oCnv^_L;9aU0)v
z@ZPe=J^XQ4)?XH!fRkZ-aq65^;<QfYDMP7PAC{2`4=14gMprs0K=tzO`O3Y`<YUG5
zr?HdG>p_P3;llkAiZ_3676_TpQJLci%?J%6R<0zv@!l!bxSjSF$#k_*FCBwM7eCjM
zDO$K}wyDRhHh;I<kvSZKn!2fLJUmuS$2=#Aq1~iO+;PLV=H7(s3;$>$R;7cuy?l^I
zr~Bnl#X!`K9;YNM|8}(nb6@qZ+&)EU9%R;w%Y$|!W<s03YyF(ZvN9IV9!NTO^`e8v
z5<_RFu%Goj`h@l9*$z984O~~vuU(kx>m|n7AtCB^R%F?836BRBU%)h&uV#1C)$|ss
zMnJ$@iKBlBKxyeDk$L09URlbPC_2*VHYTAl*RaI?malV`h<MvQ(r9zI&GCWl*TKMH
zSG3XOxoir>O;(FP)-%J{Icz`CWbVVy^F3O&2q)87gBVc_)Ee<l(0hfm7(OZJBGHo|
z%4@LkDn&MNp4F<5S=B73{6hVd@JtmPd4UFjLIBO;OVxZx67T9<rNnD3*j<m#*=27E
zP=oU^yM-%aW!~5TCA&7#uwwbeBvOxA#&?PWXJvWLXU@2mO<Voqt>`(P|Fyx&v^$Pd
zsZYR)84Jqj?cOLhm;IMG0ym9+^lK+l2yUxGxrfd!1rQ&9gW1!Js(<_L?qI0DfK_?5
z?1)5)s>vwas_2a-z#>F8zUXU2(%}!S3y-wJy(NBnPYV2uC^2Xz%M4T7v@KX>eFl?#
zM`qEAnp=l-j;)a&Zke+>_Qep+Nc^!|J<eTw^wc_bVNVEG{Oc`N$4~)NdGq2J*%-~G
z^ee1Dg~03Q0I_XklBBZCj{V(0Vas8fr-u(Cz)?fUpc|VtsO#A)k#Y=4=qm;hx)n#h
zx28y6af}Y(9ZAX`oAG`uChYV6EO;&8S7HJQx6)POb5jUI`htEgXLKhKS2fPgs<DO~
z_Iuklvnf8HK6D^cx~~9pP7K+{K7&2k9|bl*f$p7xEgGDFCqX$6;5=t;JP?b#^CsO2
z)Hx8+<U!l{)07Kop_l%#E&|8-2dNWEa!b2=wz5^)J0Po>GEY5GncqYlHfMsH*C0!I
zehUTyQ8nxzt)7;F3Hz(81qku%&HQOx;%Dg;w&!cTe^ReHj7zP^(HhqNq03O})V+yr
z1Ivee{ES=uEwBg)_!mxLg)znh)rHu)R6UU)GodnnXpFhkf4sk@z||MU9t(H!{jmi=
zYQ#)SjT8==X)`Bzn%kY(WK7#kvI_Yqm0x$1ZFTd}ysDsfi-P@Y+-jPGcd_YY-H*M4
zvmrKC4=OkErIhS$QJQwed;3Pb-SayhMSQkoJ61KSJ{QMjSZs(&{!TrBD2#y;8(He|
z`3T{zc2AKOHB?^AkU7yX((`1hb0WCLbHR-?(U1u4BR`djIW5QzUHQ~+Sgmunn;F1V
z@+06=BT{I@x});NG4)gRIt&XaE<H=_R30j}p>aRkMLsTD;>L}Pnj!K<gNrgWed_S5
zN2<T$xqM0b1`G%6(g9oPgv~Gy)A@Vch!8bS#E()9C?p&M2n5O)tN4TL!1N8Xwv1;7
z5|AH;V3yJkwal%z6P0GLX_oebiP8j3xG-e^xmo)B>oJ(`=YQ?-1~!<&&+kb{<T?ru
z&ci6t8-v)@N^{y+#+MvJz_4*S%Hyxo{7#w0NWT7<P&o&`ZU`!x0yh-IY}vy}5L4;r
zR(5O~CR3{#={q{0!zT?KDhJQh`hk`fkWd{>%%B#uzNe+WDx#T#V`K@J@${E><<;|}
zH{P*M_|>@cCs^nk?{dKQlVLNdPg<dElS9OT1}B1UFC7?l11>nIJ0o}#JT>}zej^ed
zC-`=q_ce_^t6E9zLhmm*Sz({Q9(6b^UCp$)xERDryx`b&kRLX2K?CTzH%b7fc>qCJ
zcJZOeMm{%LRzavbCxUP`BTuLt<b@HOH;^F^q`ZwfrGg8O;_O(FoE)oR)oWK-+Jz!p
znaF;p5z#&|&kY93;i<CN)#}Nj1oBoaxwxzNRT)n-@OVh~4KJ|t)#fr6++%5!f2J0|
zG&1(+3i>aWTtjFW3zGs&vT<pro~?7SP(>|1!!q6#s|PlO-w6Q?aX2h0kIx45)G|+w
z+3A>!<T+xs+>ZDqzd{eKZ3M?mqT<Qqc^U0GaONDkG=LK+M;aiU13<R83=23%-1*go
zLIYIG>i(@P{BIqvY~BMNFG`>2t8Sb<Y`>f+*h|!F1j<(0#?$rzfCxkwDgY4|5Ro(#
v5tSAfmKKBXL4>6t5WntC+5cm3b${(>=l}m32=gt&9}IvROj`+~2#@$5>%ogi

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
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

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 0858/1031] 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 0859/1031] 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 0860/1031] 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 0861/1031] 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 0862/1031] 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 0863/1031] 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 0864/1031] 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 0865/1031] 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 0866/1031] 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 0867/1031] 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 0868/1031] 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 0869/1031] 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 0870/1031] 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 0871/1031] 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 0872/1031] 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 0873/1031] 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 0874/1031] 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 0875/1031] 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 0876/1031] 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 0877/1031] 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 0878/1031] 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 0879/1031] 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 0880/1031] 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 0881/1031] 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 0882/1031] 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 0883/1031] 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 0884/1031] 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 0885/1031] 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 0886/1031] 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 0887/1031] 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 0888/1031] 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 0889/1031] 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 0890/1031] 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 0891/1031] 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 0892/1031] 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 0893/1031] 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 0894/1031] 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 0895/1031] 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 0896/1031] 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 0897/1031] 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 0898/1031] 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 0899/1031] 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 0900/1031] 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 0901/1031] 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 0902/1031] 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 0903/1031] 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 0904/1031] 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 0905/1031] 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 0906/1031] 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 0907/1031] 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 0908/1031] 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 0909/1031] 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 0910/1031] 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 0911/1031] 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 0912/1031] 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 0913/1031] =?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 0914/1031] 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 0915/1031] 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 0916/1031] 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 0917/1031] 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 0918/1031] 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 0919/1031] 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 0920/1031] 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 0921/1031] 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 0922/1031] 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 0923/1031] 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 0924/1031] 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 0925/1031] 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 0926/1031] 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 0927/1031] 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 0928/1031] 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 0929/1031] 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 0930/1031] 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 0931/1031] 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 0932/1031] 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 0933/1031] 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 0934/1031] 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 0935/1031] 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 0936/1031] 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 0937/1031] 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 0938/1031] 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 0939/1031] 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 0940/1031] 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 0941/1031] 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 0942/1031] 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 0943/1031] 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 0944/1031] 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 0945/1031] 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 0946/1031] 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 0947/1031] 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 0948/1031] 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 0949/1031] 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 0950/1031] 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 0951/1031] 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 0952/1031] 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 0953/1031] 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 0954/1031] 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 0955/1031] 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 0956/1031] 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 0957/1031] 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 0958/1031] 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 0959/1031] 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 0960/1031] 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 0961/1031] 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 0962/1031] 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 0963/1031] 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 0964/1031] 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 0965/1031] 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 0966/1031] 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 0967/1031] 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 0968/1031] 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 0969/1031] 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 0970/1031] 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 0971/1031] 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 0972/1031] 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 0973/1031] 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 0974/1031] 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 0975/1031] 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 0976/1031] 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 0977/1031] 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 0978/1031] 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 0979/1031] 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 0980/1031] 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 0981/1031] 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 0982/1031] 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 0983/1031] 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 0984/1031] 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 0985/1031] 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 0986/1031] 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 0987/1031] 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 0988/1031] 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 0989/1031] 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 0990/1031] 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 0991/1031] 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 0992/1031] 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 0993/1031] 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 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 0994/1031] 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 0995/1031] 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 0996/1031] 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 0997/1031] 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 0998/1031] 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 406839e89a43a559e6529c32998e40f8d5a77f21 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 19 May 2020 11:13:57 +0100
Subject: [PATCH 0999/1031] 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 1000/1031] 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 1001/1031] 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 833eccf5cd901d04ddfcc06a7f95e2e2ebe6f5d5 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 19 May 2020 11:25:07 +0100
Subject: [PATCH 1002/1031] 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 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 1003/1031] 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 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 1004/1031] 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 1005/1031] 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 1006/1031] 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 1007/1031] 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 1008/1031] 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 1009/1031] 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 1010/1031] 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 1011/1031] 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 1012/1031] 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 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 1013/1031] 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 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 1014/1031] 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 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 1015/1031] 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 1016/1031] 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 1017/1031] 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 1018/1031] 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 1019/1031] 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 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 1020/1031] 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 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 1021/1031] 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 1022/1031] 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 1023/1031] 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 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 1024/1031] 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 1025/1031] 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 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 1026/1031] 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 1027/1031] 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 1028/1031] 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 1029/1031] 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 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 1030/1031] 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 1031/1031] 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()});
     }