From 7d22bbc00f49356cd5fec3565a19376ef8b0ef05 Mon Sep 17 00:00:00 2001
From: Bryan Kok <bryan.wyern1@gmail.com>
Date: Sat, 17 Oct 2020 23:52:18 +0800
Subject: [PATCH 001/420] Trim spurious whitespace of nicknames

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

diff --git a/src/components/views/settings/ProfileSettings.js b/src/components/views/settings/ProfileSettings.js
index 92851ccaa0..294f80acd1 100644
--- a/src/components/views/settings/ProfileSettings.js
+++ b/src/components/views/settings/ProfileSettings.js
@@ -77,10 +77,12 @@ export default class ProfileSettings extends React.Component {
         const client = MatrixClientPeg.get();
         const newState = {};
 
+        const displayName = this.state.displayName.trim();
         try {
             if (this.state.originalDisplayName !== this.state.displayName) {
-                await client.setDisplayName(this.state.displayName);
-                newState.originalDisplayName = this.state.displayName;
+                await client.setDisplayName(displayName);
+                newState.originalDisplayName = displayName;
+                newState.displayName = displayName;
             }
 
             if (this.state.avatarFile) {

From fcbaea640daf3a036d55cb1bda5d7fed552c2d4e Mon Sep 17 00:00:00 2001
From: Bryan Kok <bryan.wyern1@gmail.com>
Date: Sun, 18 Oct 2020 14:36:50 +0800
Subject: [PATCH 002/420] Trim room names changed through the UI

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

diff --git a/src/components/views/room_settings/RoomProfileSettings.js b/src/components/views/room_settings/RoomProfileSettings.js
index ca09c3093a..b894663c16 100644
--- a/src/components/views/room_settings/RoomProfileSettings.js
+++ b/src/components/views/room_settings/RoomProfileSettings.js
@@ -95,10 +95,11 @@ export default class RoomProfileSettings extends React.Component {
         const newState = {};
 
         // TODO: What do we do about errors?
-
+        const displayName = this.state.displayName.trim();
         if (this.state.originalDisplayName !== this.state.displayName) {
-            await client.setRoomName(this.props.roomId, this.state.displayName);
-            newState.originalDisplayName = this.state.displayName;
+            await client.setRoomName(this.props.roomId, displayName);
+            newState.originalDisplayName = displayName;
+            newState.displayName = displayName;
         }
 
         if (this.state.avatarFile) {

From 2f988bc97fc1e414bd70149ac5f77301a3ef2833 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Thu, 26 Nov 2020 13:51:03 +0100
Subject: [PATCH 003/420] Added UI

---
 .../views/settings/SpellCheckSettings.tsx     | 111 ++++++++++++++++++
 .../tabs/user/GeneralUserSettingsTab.js       |  18 +++
 2 files changed, 129 insertions(+)
 create mode 100644 src/components/views/settings/SpellCheckSettings.tsx

diff --git a/src/components/views/settings/SpellCheckSettings.tsx b/src/components/views/settings/SpellCheckSettings.tsx
new file mode 100644
index 0000000000..1bdcd882c9
--- /dev/null
+++ b/src/components/views/settings/SpellCheckSettings.tsx
@@ -0,0 +1,111 @@
+/*
+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 LanguageDropdown from "../../../components/views/elements/LanguageDropdown";
+import AccessibleButton from "../../../components/views/elements/AccessibleButton";
+import {_t} from "../../../languageHandler";
+
+interface ExistingSpellCheckLanguageIProps {
+    language: string,
+    onRemoved(language: string),
+};
+
+interface SpellCheckLanguagesIProps {
+    languages: Array<string>,
+    onLanguagesChange(languages: Array<string>),
+};
+
+interface SpellCheckLanguagesIState {
+    newLanguage: string,
+}
+
+export class ExistingSpellCheckLanguage extends React.Component<ExistingSpellCheckLanguageIProps> {
+    _onRemove = (e) => {
+        e.stopPropagation();
+        e.preventDefault();
+
+        return this.props.onRemoved(this.props.language);
+    };
+
+    render() {
+        return (
+            <div className="mx_ExistingSpellCheckerLanguage">
+                <span className="mx_ExistingSpellCheckerLanguage_language">{this.props.language}</span>
+                <AccessibleButton onClick={this._onRemove} kind="danger_sm">
+                    {_t("Remove")}
+                </AccessibleButton>
+            </div>
+        );
+    }
+}
+
+export default class SpellCheckLanguages extends React.Component<SpellCheckLanguagesIProps, SpellCheckLanguagesIState> {
+    constructor(props) {
+        super(props);
+        this.state = {
+            newLanguage: "",
+        }
+    }
+
+    _onRemoved = (language) => {
+        const languages = this.props.languages.filter((e) => e !== language);
+        this.props.onLanguagesChange(languages);
+    };
+
+    _onAddClick = (e) => {
+        e.stopPropagation();
+        e.preventDefault();
+
+        const language = this.state.newLanguage;
+        
+        if (!language) return;
+        if (this.props.languages.includes(language)) return;
+
+        this.props.languages.push(language)
+        this.props.onLanguagesChange(this.props.languages);
+    };
+
+    _onNewLanguageChange = (language: string) => {
+        if (this.state.newLanguage === language) return;
+        this.setState({newLanguage: language});
+    };
+
+    render() {
+        const existingSpellCheckLanguages = this.props.languages.map((e) => {
+            return <ExistingSpellCheckLanguage language={e} onRemoved={this._onRemoved} key={e} />;
+        });
+
+        let addButton = (
+            <AccessibleButton onClick={this._onAddClick} kind="primary">
+                {_t("Add")}
+            </AccessibleButton>
+        );
+
+        return (
+            <div className="mx_SpellCheckerLanguages">
+                {existingSpellCheckLanguages}
+                <form onSubmit={this._onAddClick} noValidate={true}
+                      className="mx_mx_SpellCheckerLanguages_new">
+                    <LanguageDropdown className="mx_GeneralUserSettingsTab_spellCheckLanguageInput"
+                                      value={this.state.newLanguage}
+                                      onOptionChange={this._onNewLanguageChange} />
+                    {addButton}
+                </form>
+            </div>
+        );
+    };
+}
diff --git a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
index 35285351ab..6d04d83047 100644
--- a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
@@ -22,6 +22,7 @@ import ProfileSettings from "../../ProfileSettings";
 import * as languageHandler from "../../../../../languageHandler";
 import SettingsStore from "../../../../../settings/SettingsStore";
 import LanguageDropdown from "../../../elements/LanguageDropdown";
+import SpellCheckSettings from "../../SpellCheckSettings"
 import AccessibleButton from "../../../elements/AccessibleButton";
 import DeactivateAccountDialog from "../../../dialogs/DeactivateAccountDialog";
 import PropTypes from "prop-types";
@@ -49,6 +50,7 @@ export default class GeneralUserSettingsTab extends React.Component {
 
         this.state = {
             language: languageHandler.getCurrentLanguage(),
+            spellCheckLanguages: [],
             haveIdServer: Boolean(MatrixClientPeg.get().getIdentityServerUrl()),
             serverSupportsSeparateAddAndBind: null,
             idServerHasUnsignedTerms: false,
@@ -182,6 +184,10 @@ export default class GeneralUserSettingsTab extends React.Component {
         PlatformPeg.get().reload();
     };
 
+    _onSpellCheckLanguagesChange = (languages) => {
+        this.setState({spellCheckLanguages: languages})
+    };
+
     _onPasswordChangeError = (err) => {
         // TODO: Figure out a design that doesn't involve replacing the current dialog
         let errMsg = err.error || "";
@@ -303,6 +309,17 @@ export default class GeneralUserSettingsTab extends React.Component {
         );
     }
 
+    _renderSpellCheckSection() {
+        return (
+             <div className="mx_SettingsTab_section">
+                <span className="mx_SettingsTab_subheading">{_t("Spell checking")}</span>
+                <SpellCheckSettings className="mx_GeneralUserSettingsTab_spellCheckLanguageInput"
+                            languages={this.state.spellCheckLanguages}
+                            onLanguagesChange={this._onSpellCheckLanguagesChange} />
+            </div>
+        );
+    }
+
     _renderDiscoverySection() {
         const SetIdServer = sdk.getComponent("views.settings.SetIdServer");
 
@@ -409,6 +426,7 @@ export default class GeneralUserSettingsTab extends React.Component {
                 {this._renderProfileSection()}
                 {this._renderAccountSection()}
                 {this._renderLanguageSection()}
+                {this._renderSpellCheckSection()}
                 { discoverySection }
                 {this._renderIntegrationManagerSection() /* Has its own title */}
                 { accountManagementSection }

From 051368eaab50e4a7d6f2ce554ddff0ed957bb965 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Thu, 26 Nov 2020 13:53:22 +0100
Subject: [PATCH 004/420] Fix i18n

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

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 0d50128f32..7fbcc1a350 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1109,6 +1109,7 @@
     "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.",
+    "Add": "Add",
     "Error encountered (%(errorDetail)s).": "Error encountered (%(errorDetail)s).",
     "Checking for an update...": "Checking for an update...",
     "No update available.": "No update available.",
@@ -1140,6 +1141,7 @@
     "Set a new account password...": "Set a new account password...",
     "Account": "Account",
     "Language and region": "Language and region",
+    "Spell checking": "Spell checking",
     "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!",
@@ -1337,7 +1339,6 @@
     "Invalid Email Address": "Invalid Email Address",
     "This doesn't appear to be a valid email address": "This doesn't appear to be a valid email address",
     "Unable to add email address": "Unable to add email address",
-    "Add": "Add",
     "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.": "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.",
     "Email Address": "Email Address",
     "Remove %(phone)s?": "Remove %(phone)s?",

From 557e650a2c2e2eb24584f21bd4175e69cc7500a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Sat, 28 Nov 2020 19:37:49 +0100
Subject: [PATCH 005/420] Added spell-check-languages setting

---
 src/settings/Settings.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/settings/Settings.ts b/src/settings/Settings.ts
index 31e133be72..409cd293d2 100644
--- a/src/settings/Settings.ts
+++ b/src/settings/Settings.ts
@@ -402,6 +402,10 @@ export const SETTINGS: {[setting: string]: ISetting} = {
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG,
         default: "en",
     },
+    "spell-check-languages": {
+        supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG,
+        default: [],
+    },
     "breadcrumb_rooms": {
         // not really a setting
         supportedLevels: [SettingLevel.ACCOUNT],

From 43daec03e24820a485f97da0b5cb0311f137e729 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Sat, 28 Nov 2020 19:38:52 +0100
Subject: [PATCH 006/420] Added setSpellCheckLanguages() method

---
 src/languageHandler.tsx | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/languageHandler.tsx b/src/languageHandler.tsx
index b61f57d4b3..9b9e304294 100644
--- a/src/languageHandler.tsx
+++ b/src/languageHandler.tsx
@@ -346,6 +346,13 @@ export function setLanguage(preferredLangs: string | string[]) {
     });
 }
 
+export function setSpellCheckLanguages(preferredLangs: string[]) {
+    const plaf = PlatformPeg.get();
+    if (plaf) {
+        plaf.setLanguage(preferredLangs);
+    }
+}
+
 export function getAllLanguagesFromJson() {
     return getLangsJson().then((langsObject) => {
         const langs = [];

From 5e4f9907cf87e02b41791ce729b38d7474dcbf01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Sat, 28 Nov 2020 19:39:09 +0100
Subject: [PATCH 007/420] Added persistance

---
 .../views/settings/tabs/user/GeneralUserSettingsTab.js        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
index 6d04d83047..585f4fd5b7 100644
--- a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
@@ -50,7 +50,7 @@ export default class GeneralUserSettingsTab extends React.Component {
 
         this.state = {
             language: languageHandler.getCurrentLanguage(),
-            spellCheckLanguages: [],
+            spellCheckLanguages: SettingsStore.getValue("spell-check-languages", null, /*excludeDefault=*/true),
             haveIdServer: Boolean(MatrixClientPeg.get().getIdentityServerUrl()),
             serverSupportsSeparateAddAndBind: null,
             idServerHasUnsignedTerms: false,
@@ -185,7 +185,9 @@ export default class GeneralUserSettingsTab extends React.Component {
     };
 
     _onSpellCheckLanguagesChange = (languages) => {
+        SettingsStore.setValue("spell-check-languages", null, SettingLevel.DEVICE, languages);
         this.setState({spellCheckLanguages: languages})
+        PlatformPeg.get().reload();
     };
 
     _onPasswordChangeError = (err) => {

From f0bbed0c44270f8411c0ce0f4ee0cf08142a1c1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Sun, 29 Nov 2020 12:17:07 +0100
Subject: [PATCH 008/420] Allow default value

---
 .../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 585f4fd5b7..68a16463b0 100644
--- a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
@@ -50,7 +50,7 @@ export default class GeneralUserSettingsTab extends React.Component {
 
         this.state = {
             language: languageHandler.getCurrentLanguage(),
-            spellCheckLanguages: SettingsStore.getValue("spell-check-languages", null, /*excludeDefault=*/true),
+            spellCheckLanguages: SettingsStore.getValue("spell-check-languages", null, false),
             haveIdServer: Boolean(MatrixClientPeg.get().getIdentityServerUrl()),
             serverSupportsSeparateAddAndBind: null,
             idServerHasUnsignedTerms: false,

From 8f40cd39fda1ee83ec6b177ba7935f913ed5a45b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Sun, 29 Nov 2020 12:29:05 +0100
Subject: [PATCH 009/420] Added styling

---
 res/css/_components.scss                      |  1 +
 .../views/settings/_SpellCheckLanguages.scss  | 36 +++++++++++++++++++
 .../views/settings/SpellCheckSettings.tsx     |  9 +++--
 .../tabs/user/GeneralUserSettingsTab.js       |  7 ++--
 4 files changed, 44 insertions(+), 9 deletions(-)
 create mode 100644 res/css/views/settings/_SpellCheckLanguages.scss

diff --git a/res/css/_components.scss b/res/css/_components.scss
index 445ed70ff4..1eb4b91a31 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -207,6 +207,7 @@
 @import "./views/settings/_DevicesPanel.scss";
 @import "./views/settings/_E2eAdvancedPanel.scss";
 @import "./views/settings/_EmailAddresses.scss";
+@import "./views/settings/_SpellCheckLanguages.scss";
 @import "./views/settings/_IntegrationManager.scss";
 @import "./views/settings/_Notifications.scss";
 @import "./views/settings/_PhoneNumbers.scss";
diff --git a/res/css/views/settings/_SpellCheckLanguages.scss b/res/css/views/settings/_SpellCheckLanguages.scss
new file mode 100644
index 0000000000..734f669f0e
--- /dev/null
+++ b/res/css/views/settings/_SpellCheckLanguages.scss
@@ -0,0 +1,36 @@
+/*
+Copyright 2019 New Vector Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT 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_ExistingSpellCheckLanguage {
+    display: flex;
+    align-items: center;
+    margin-bottom: 5px;
+}
+
+.mx_ExistingSpellCheckLanguage_language {
+    flex: 1;
+    margin-right: 10px;
+}
+
+.mx_GeneralUserSettingsTab_spellCheckLanguageInput {
+    margin-top: 1em;
+    margin-bottom: 1em;
+}
+
+.mx_SpellCheckLanguages {
+    @mixin mx_Settings_fullWidthField;
+}
\ No newline at end of file
diff --git a/src/components/views/settings/SpellCheckSettings.tsx b/src/components/views/settings/SpellCheckSettings.tsx
index 1bdcd882c9..befd98112e 100644
--- a/src/components/views/settings/SpellCheckSettings.tsx
+++ b/src/components/views/settings/SpellCheckSettings.tsx
@@ -43,8 +43,8 @@ export class ExistingSpellCheckLanguage extends React.Component<ExistingSpellChe
 
     render() {
         return (
-            <div className="mx_ExistingSpellCheckerLanguage">
-                <span className="mx_ExistingSpellCheckerLanguage_language">{this.props.language}</span>
+            <div className="mx_ExistingSpellCheckLanguage">
+                <span className="mx_ExistingSpellCheckLanguage_language">{this.props.language}</span>
                 <AccessibleButton onClick={this._onRemove} kind="danger_sm">
                     {_t("Remove")}
                 </AccessibleButton>
@@ -96,10 +96,9 @@ export default class SpellCheckLanguages extends React.Component<SpellCheckLangu
         );
 
         return (
-            <div className="mx_SpellCheckerLanguages">
+            <div className="mx_SpellCheckLanguages">
                 {existingSpellCheckLanguages}
-                <form onSubmit={this._onAddClick} noValidate={true}
-                      className="mx_mx_SpellCheckerLanguages_new">
+                <form onSubmit={this._onAddClick} noValidate={true}>
                     <LanguageDropdown className="mx_GeneralUserSettingsTab_spellCheckLanguageInput"
                                       value={this.state.newLanguage}
                                       onOptionChange={this._onNewLanguageChange} />
diff --git a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
index 68a16463b0..258ff6d318 100644
--- a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
@@ -313,11 +313,10 @@ export default class GeneralUserSettingsTab extends React.Component {
 
     _renderSpellCheckSection() {
         return (
-             <div className="mx_SettingsTab_section">
+            <div className="mx_SettingsTab_section">
                 <span className="mx_SettingsTab_subheading">{_t("Spell checking")}</span>
-                <SpellCheckSettings className="mx_GeneralUserSettingsTab_spellCheckLanguageInput"
-                            languages={this.state.spellCheckLanguages}
-                            onLanguagesChange={this._onSpellCheckLanguagesChange} />
+                <SpellCheckSettings languages={this.state.spellCheckLanguages}
+                                    onLanguagesChange={this._onSpellCheckLanguagesChange} />
             </div>
         );
     }

From 7609f2004e6a004c22e0da189f58cee823bf4468 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Sun, 29 Nov 2020 13:22:50 +0100
Subject: [PATCH 010/420] Added newline to end

---
 res/css/views/settings/_SpellCheckLanguages.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/views/settings/_SpellCheckLanguages.scss b/res/css/views/settings/_SpellCheckLanguages.scss
index 734f669f0e..ddfa0bf9e0 100644
--- a/res/css/views/settings/_SpellCheckLanguages.scss
+++ b/res/css/views/settings/_SpellCheckLanguages.scss
@@ -33,4 +33,4 @@ limitations under the License.
 
 .mx_SpellCheckLanguages {
     @mixin mx_Settings_fullWidthField;
-}
\ No newline at end of file
+}

From ead00dcdede9e6a24904599baba39bc91de0681a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Sun, 29 Nov 2020 14:46:09 +0100
Subject: [PATCH 011/420] Set spell-check languages without reloading

---
 .../views/settings/tabs/user/GeneralUserSettingsTab.js      | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
index 258ff6d318..ad7e04d677 100644
--- a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
@@ -187,7 +187,11 @@ export default class GeneralUserSettingsTab extends React.Component {
     _onSpellCheckLanguagesChange = (languages) => {
         SettingsStore.setValue("spell-check-languages", null, SettingLevel.DEVICE, languages);
         this.setState({spellCheckLanguages: languages})
-        PlatformPeg.get().reload();
+        
+        const plaf = PlatformPeg.get();
+        if (plaf) {
+            plaf.setLanguage(languages);
+        }
     };
 
     _onPasswordChangeError = (err) => {

From 38080c5b2bccafb7dae5c9737e69ad7f295f1d7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Sun, 29 Nov 2020 20:46:47 +0100
Subject: [PATCH 012/420] Added getAvailableSpellCheckLanguages() methods

---
 src/BasePlatform.ts     | 4 ++++
 src/languageHandler.tsx | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/src/BasePlatform.ts b/src/BasePlatform.ts
index 0a1f06f0b3..9ac35092a7 100644
--- a/src/BasePlatform.ts
+++ b/src/BasePlatform.ts
@@ -237,6 +237,10 @@ export default abstract class BasePlatform {
 
     setLanguage(preferredLangs: string[]) {}
 
+    getAvailableSpellCheckLanguages(): Promise<string[]> | null {
+        return null;
+    }
+
     protected getSSOCallbackUrl(fragmentAfterLogin: string): URL {
         const url = new URL(window.location.href);
         url.hash = fragmentAfterLogin || "";
diff --git a/src/languageHandler.tsx b/src/languageHandler.tsx
index 9b9e304294..b827e83ded 100644
--- a/src/languageHandler.tsx
+++ b/src/languageHandler.tsx
@@ -353,6 +353,11 @@ export function setSpellCheckLanguages(preferredLangs: string[]) {
     }
 }
 
+export async function getAvailableSpellCheckLanguages(): Promise<string[]> {
+    const plaf = PlatformPeg.get();
+    return plaf.getAvailableSpellCheckLanguages();
+}
+
 export function getAllLanguagesFromJson() {
     return getLangsJson().then((langsObject) => {
         const langs = [];

From 5d9f5ba979d3fc89bf6eec5ad2f319bea7168aec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Mon, 30 Nov 2020 08:35:51 +0100
Subject: [PATCH 013/420] Fix indentation

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

diff --git a/src/components/views/elements/LanguageDropdown.js b/src/components/views/elements/LanguageDropdown.js
index e37109caff..03ec456af5 100644
--- a/src/components/views/elements/LanguageDropdown.js
+++ b/src/components/views/elements/LanguageDropdown.js
@@ -100,10 +100,10 @@ export default class LanguageDropdown extends React.Component {
         let language = SettingsStore.getValue("language", null, /*excludeDefault:*/true);
         let value = null;
         if (language) {
-          value = this.props.value || language;
+            value = this.props.value || language;
         } else {
-          language = navigator.language || navigator.userLanguage;
-          value = this.props.value || language;
+            language = navigator.language || navigator.userLanguage;
+            value = this.props.value || language;
         }
 
         return <Dropdown

From b207a877ebb4aca95a4eb42695b2821250ffb385 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Tue, 1 Dec 2020 16:59:02 +0100
Subject: [PATCH 014/420] Change label

---
 .../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 ad7e04d677..8d06ea3b36 100644
--- a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
@@ -318,7 +318,7 @@ export default class GeneralUserSettingsTab extends React.Component {
     _renderSpellCheckSection() {
         return (
             <div className="mx_SettingsTab_section">
-                <span className="mx_SettingsTab_subheading">{_t("Spell checking")}</span>
+                <span className="mx_SettingsTab_subheading">{_t("Spell check dictionaries")}</span>
                 <SpellCheckSettings languages={this.state.spellCheckLanguages}
                                     onLanguagesChange={this._onSpellCheckLanguagesChange} />
             </div>

From cf61d50df40614a45c36c0d9886c3583ca69513e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Tue, 1 Dec 2020 16:59:21 +0100
Subject: [PATCH 015/420] Added SpellCheckLanguagesDropdown

---
 .../elements/SpellCheckLanguagesDropdown.tsx  | 125 ++++++++++++++++++
 .../views/settings/SpellCheckSettings.tsx     |   4 +-
 2 files changed, 127 insertions(+), 2 deletions(-)
 create mode 100644 src/components/views/elements/SpellCheckLanguagesDropdown.tsx

diff --git a/src/components/views/elements/SpellCheckLanguagesDropdown.tsx b/src/components/views/elements/SpellCheckLanguagesDropdown.tsx
new file mode 100644
index 0000000000..db158fa3dd
--- /dev/null
+++ b/src/components/views/elements/SpellCheckLanguagesDropdown.tsx
@@ -0,0 +1,125 @@
+/*
+Copyright 2017 Marcel Radzio (MTRNord)
+Copyright 2017 Vector Creations Ltd.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import PropTypes from 'prop-types';
+
+import Dropdown from "../../views/elements/Dropdown"
+import PlatformPeg from "../../../PlatformPeg";
+import * as sdk from '../../../index';
+import * as languageHandler from '../../../languageHandler';
+import SettingsStore from "../../../settings/SettingsStore";
+import { _t } from "../../../languageHandler";
+
+function languageMatchesSearchQuery(query, language) {
+    if (language.label.toUpperCase().includes(query.toUpperCase())) return true;
+    if (language.value.toUpperCase() === query.toUpperCase()) return true;
+    return false;
+}
+
+interface SpellCheckLanguagesDropdownIProps {
+    className: string,
+    value: string,
+    onOptionChange(language: string),
+};
+
+interface SpellCheckLanguagesDropdownIState {
+    searchQuery: string,
+    languages: any,
+}
+
+export default class SpellCheckLanguagesDropdown extends React.Component<SpellCheckLanguagesDropdownIProps, SpellCheckLanguagesDropdownIState> {
+    constructor(props) {
+        super(props);
+        this._onSearchChange = this._onSearchChange.bind(this);
+
+        this.state = {
+            searchQuery: '',
+            languages: null,
+        };
+    }
+
+    componentDidMount() {
+        languageHandler.getAvailableSpellCheckLanguages().then((languages) => {
+            languages.sort(function(a, b) {
+                if (a < b) return -1;
+                if (a > b) return 1;
+                return 0;
+            });
+            var langs = [];
+            languages.forEach((language) => {
+                langs.push({
+                    label: language,
+                    value: language,
+                })
+            })
+            this.setState({languages: langs});
+        }).catch((e) => {
+            this.setState({languages: ['en']});
+        });
+    }
+
+    _onSearchChange(search) {
+        this.setState({
+            searchQuery: search,
+        });
+    }
+
+    render() {
+        if (this.state.languages === null) {
+            const Spinner = sdk.getComponent('elements.Spinner');
+            return <Spinner />;
+        }
+
+        let displayedLanguages;
+        if (this.state.searchQuery) {
+            displayedLanguages = this.state.languages.filter((lang) => {
+                return languageMatchesSearchQuery(this.state.searchQuery, lang);
+            });
+        } else {
+            displayedLanguages = this.state.languages;
+        }
+
+        const options = displayedLanguages.map((language) => {
+            return <div key={language.value}>
+                { language.label }
+            </div>;
+        });
+
+        // default value here too, otherwise we need to handle null / undefined;
+        // values between mounting and the initial value propgating
+        let language = SettingsStore.getValue("language", null, /*excludeDefault:*/true);
+        let value = null;
+        if (language) {
+            value = this.props.value || language;
+        } else {
+            language = navigator.language || navigator.userLanguage;
+            value = this.props.value || language;
+        }
+
+        return <Dropdown
+            id="mx_LanguageDropdown"
+            className={this.props.className}
+            onOptionChange={this.props.onOptionChange}
+            onSearchChange={this._onSearchChange}
+            searchEnabled={true}
+            value={value}
+            label={_t("Language Dropdown")}>
+            { options }
+        </Dropdown>;
+    }
+}
diff --git a/src/components/views/settings/SpellCheckSettings.tsx b/src/components/views/settings/SpellCheckSettings.tsx
index befd98112e..37476d5f34 100644
--- a/src/components/views/settings/SpellCheckSettings.tsx
+++ b/src/components/views/settings/SpellCheckSettings.tsx
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
-import LanguageDropdown from "../../../components/views/elements/LanguageDropdown";
+import SpellCheckLanguagesDropdown from "../../../components/views/elements/SpellCheckLanguagesDropdown";
 import AccessibleButton from "../../../components/views/elements/AccessibleButton";
 import {_t} from "../../../languageHandler";
 
@@ -99,7 +99,7 @@ export default class SpellCheckLanguages extends React.Component<SpellCheckLangu
             <div className="mx_SpellCheckLanguages">
                 {existingSpellCheckLanguages}
                 <form onSubmit={this._onAddClick} noValidate={true}>
-                    <LanguageDropdown className="mx_GeneralUserSettingsTab_spellCheckLanguageInput"
+                    <SpellCheckLanguagesDropdown className="mx_GeneralUserSettingsTab_spellCheckLanguageInput"
                                       value={this.state.newLanguage}
                                       onOptionChange={this._onNewLanguageChange} />
                     {addButton}

From a6d6af1a937fb6bc6cec2e320fbff453bef3c680 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Tue, 1 Dec 2020 17:19:45 +0100
Subject: [PATCH 016/420] Added defaults

---
 src/settings/Settings.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/settings/Settings.ts b/src/settings/Settings.ts
index 409cd293d2..c83dbab897 100644
--- a/src/settings/Settings.ts
+++ b/src/settings/Settings.ts
@@ -404,7 +404,7 @@ export const SETTINGS: {[setting: string]: ISetting} = {
     },
     "spell-check-languages": {
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG,
-        default: [],
+        default: ["en"],
     },
     "breadcrumb_rooms": {
         // not really a setting

From e9203d75715dbd6a677849dbb83a3d4706b2e6e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Tue, 1 Dec 2020 17:21:23 +0100
Subject: [PATCH 017/420] Removed unnecessary imports

---
 src/components/views/elements/SpellCheckLanguagesDropdown.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/components/views/elements/SpellCheckLanguagesDropdown.tsx b/src/components/views/elements/SpellCheckLanguagesDropdown.tsx
index db158fa3dd..5e0fe3132c 100644
--- a/src/components/views/elements/SpellCheckLanguagesDropdown.tsx
+++ b/src/components/views/elements/SpellCheckLanguagesDropdown.tsx
@@ -16,10 +16,8 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
 
 import Dropdown from "../../views/elements/Dropdown"
-import PlatformPeg from "../../../PlatformPeg";
 import * as sdk from '../../../index';
 import * as languageHandler from '../../../languageHandler';
 import SettingsStore from "../../../settings/SettingsStore";

From 8287f197f40869941d402e45da87c88d19514545 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Tue, 1 Dec 2020 19:49:31 +0100
Subject: [PATCH 018/420] Fix 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 282c1ce686..9ccd0e1e75 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1149,7 +1149,7 @@
     "Set a new account password...": "Set a new account password...",
     "Account": "Account",
     "Language and region": "Language and region",
-    "Spell checking": "Spell checking",
+    "Spell check dictionaries": "Spell check dictionaries",
     "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!",

From 44a363f188fb95927fff942b4c6b5a3914dbe31d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Tue, 1 Dec 2020 20:16:48 +0100
Subject: [PATCH 019/420] Fix default value

---
 src/settings/Settings.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/settings/Settings.ts b/src/settings/Settings.ts
index c83dbab897..3540767a99 100644
--- a/src/settings/Settings.ts
+++ b/src/settings/Settings.ts
@@ -404,7 +404,7 @@ export const SETTINGS: {[setting: string]: ISetting} = {
     },
     "spell-check-languages": {
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG,
-        default: ["en"],
+        default: ["en-US"],
     },
     "breadcrumb_rooms": {
         // not really a setting

From 3c2bb6e4f6d19e337d902613adbddf42fcba2f3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Tue, 1 Dec 2020 20:17:24 +0100
Subject: [PATCH 020/420] Cleanup

---
 src/BasePlatform.ts                                          | 2 ++
 .../views/settings/tabs/user/GeneralUserSettingsTab.js       | 5 +----
 src/languageHandler.tsx                                      | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/BasePlatform.ts b/src/BasePlatform.ts
index 9ac35092a7..2af2ea51c5 100644
--- a/src/BasePlatform.ts
+++ b/src/BasePlatform.ts
@@ -237,6 +237,8 @@ export default abstract class BasePlatform {
 
     setLanguage(preferredLangs: string[]) {}
 
+    setSpellCheckLanguages(preferredLangs: string[]) {}
+
     getAvailableSpellCheckLanguages(): Promise<string[]> | null {
         return null;
     }
diff --git a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
index 8d06ea3b36..6ed887d749 100644
--- a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
@@ -188,10 +188,7 @@ export default class GeneralUserSettingsTab extends React.Component {
         SettingsStore.setValue("spell-check-languages", null, SettingLevel.DEVICE, languages);
         this.setState({spellCheckLanguages: languages})
         
-        const plaf = PlatformPeg.get();
-        if (plaf) {
-            plaf.setLanguage(languages);
-        }
+        languageHandler.setSpellCheckLanguages(languages);
     };
 
     _onPasswordChangeError = (err) => {
diff --git a/src/languageHandler.tsx b/src/languageHandler.tsx
index b827e83ded..38d3c8347a 100644
--- a/src/languageHandler.tsx
+++ b/src/languageHandler.tsx
@@ -349,7 +349,7 @@ export function setLanguage(preferredLangs: string | string[]) {
 export function setSpellCheckLanguages(preferredLangs: string[]) {
     const plaf = PlatformPeg.get();
     if (plaf) {
-        plaf.setLanguage(preferredLangs);
+        plaf.setSpellCheckLanguages(preferredLangs);
     }
 }
 

From db5bc0cb7ade92fc056283af639e3c782d384e4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Tue, 1 Dec 2020 20:36:25 +0100
Subject: [PATCH 021/420] Fix formatting

---
 .../elements/SpellCheckLanguagesDropdown.tsx    |  7 ++++---
 .../views/settings/SpellCheckSettings.tsx       | 17 +++++++++--------
 .../tabs/user/GeneralUserSettingsTab.js         |  6 +++---
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/components/views/elements/SpellCheckLanguagesDropdown.tsx b/src/components/views/elements/SpellCheckLanguagesDropdown.tsx
index 5e0fe3132c..53c3f310b7 100644
--- a/src/components/views/elements/SpellCheckLanguagesDropdown.tsx
+++ b/src/components/views/elements/SpellCheckLanguagesDropdown.tsx
@@ -33,14 +33,15 @@ interface SpellCheckLanguagesDropdownIProps {
     className: string,
     value: string,
     onOptionChange(language: string),
-};
+}
 
 interface SpellCheckLanguagesDropdownIState {
     searchQuery: string,
     languages: any,
 }
 
-export default class SpellCheckLanguagesDropdown extends React.Component<SpellCheckLanguagesDropdownIProps, SpellCheckLanguagesDropdownIState> {
+export default class SpellCheckLanguagesDropdown extends React.Component<SpellCheckLanguagesDropdownIProps,
+                                                                         SpellCheckLanguagesDropdownIState> {
     constructor(props) {
         super(props);
         this._onSearchChange = this._onSearchChange.bind(this);
@@ -58,7 +59,7 @@ export default class SpellCheckLanguagesDropdown extends React.Component<SpellCh
                 if (a > b) return 1;
                 return 0;
             });
-            var langs = [];
+            const langs = [];
             languages.forEach((language) => {
                 langs.push({
                     label: language,
diff --git a/src/components/views/settings/SpellCheckSettings.tsx b/src/components/views/settings/SpellCheckSettings.tsx
index 37476d5f34..bfe0774570 100644
--- a/src/components/views/settings/SpellCheckSettings.tsx
+++ b/src/components/views/settings/SpellCheckSettings.tsx
@@ -22,12 +22,12 @@ import {_t} from "../../../languageHandler";
 interface ExistingSpellCheckLanguageIProps {
     language: string,
     onRemoved(language: string),
-};
+}
 
 interface SpellCheckLanguagesIProps {
     languages: Array<string>,
     onLanguagesChange(languages: Array<string>),
-};
+}
 
 interface SpellCheckLanguagesIState {
     newLanguage: string,
@@ -71,7 +71,7 @@ export default class SpellCheckLanguages extends React.Component<SpellCheckLangu
         e.preventDefault();
 
         const language = this.state.newLanguage;
-        
+
         if (!language) return;
         if (this.props.languages.includes(language)) return;
 
@@ -89,7 +89,7 @@ export default class SpellCheckLanguages extends React.Component<SpellCheckLangu
             return <ExistingSpellCheckLanguage language={e} onRemoved={this._onRemoved} key={e} />;
         });
 
-        let addButton = (
+        const addButton = (
             <AccessibleButton onClick={this._onAddClick} kind="primary">
                 {_t("Add")}
             </AccessibleButton>
@@ -99,12 +99,13 @@ export default class SpellCheckLanguages extends React.Component<SpellCheckLangu
             <div className="mx_SpellCheckLanguages">
                 {existingSpellCheckLanguages}
                 <form onSubmit={this._onAddClick} noValidate={true}>
-                    <SpellCheckLanguagesDropdown className="mx_GeneralUserSettingsTab_spellCheckLanguageInput"
-                                      value={this.state.newLanguage}
-                                      onOptionChange={this._onNewLanguageChange} />
+                    <SpellCheckLanguagesDropdown
+                        className="mx_GeneralUserSettingsTab_spellCheckLanguageInput"
+                        value={this.state.newLanguage}
+                        onOptionChange={this._onNewLanguageChange} />
                     {addButton}
                 </form>
             </div>
         );
-    };
+    }
 }
diff --git a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
index 6ed887d749..95a8abbb24 100644
--- a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
@@ -22,7 +22,7 @@ import ProfileSettings from "../../ProfileSettings";
 import * as languageHandler from "../../../../../languageHandler";
 import SettingsStore from "../../../../../settings/SettingsStore";
 import LanguageDropdown from "../../../elements/LanguageDropdown";
-import SpellCheckSettings from "../../SpellCheckSettings"
+import SpellCheckSettings from "../../SpellCheckSettings";
 import AccessibleButton from "../../../elements/AccessibleButton";
 import DeactivateAccountDialog from "../../../dialogs/DeactivateAccountDialog";
 import PropTypes from "prop-types";
@@ -186,8 +186,8 @@ export default class GeneralUserSettingsTab extends React.Component {
 
     _onSpellCheckLanguagesChange = (languages) => {
         SettingsStore.setValue("spell-check-languages", null, SettingLevel.DEVICE, languages);
-        this.setState({spellCheckLanguages: languages})
-        
+        this.setState({spellCheckLanguages: languages});
+
         languageHandler.setSpellCheckLanguages(languages);
     };
 

From bab541a652e402c1aede8caa00b22b13a2adb0c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Wed, 2 Dec 2020 20:14:58 +0100
Subject: [PATCH 022/420] Hide spell-check settings if not using Electron

---
 src/BasePlatform.ts                                       | 8 ++++++++
 .../views/settings/tabs/user/GeneralUserSettingsTab.js    | 5 ++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/BasePlatform.ts b/src/BasePlatform.ts
index 2af2ea51c5..54d15675cb 100644
--- a/src/BasePlatform.ts
+++ b/src/BasePlatform.ts
@@ -128,6 +128,14 @@ export default abstract class BasePlatform {
         hideUpdateToast();
     }
 
+    /**
+     * Return true if platform supports multi-language
+     * spell-checking, otherwise false.
+     */
+    supportsMultiLanguageSpellCheck(): boolean {
+        return false;
+    }
+
     /**
      * Returns true if the platform supports displaying
      * notifications, otherwise false.
diff --git a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
index 95a8abbb24..4d1210dc40 100644
--- a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
@@ -400,6 +400,9 @@ export default class GeneralUserSettingsTab extends React.Component {
     }
 
     render() {
+        const plaf = PlatformPeg.get();
+        const supportsMultiLanguageSpellCheck = plaf.supportsMultiLanguageSpellCheck() ? true : false;
+
         const discoWarning = this.state.requiredPolicyInfo.hasTerms
             ? <img className='mx_GeneralUserSettingsTab_warningIcon'
                 src={require("../../../../../../res/img/feather-customised/warning-triangle.svg")}
@@ -428,7 +431,7 @@ export default class GeneralUserSettingsTab extends React.Component {
                 {this._renderProfileSection()}
                 {this._renderAccountSection()}
                 {this._renderLanguageSection()}
-                {this._renderSpellCheckSection()}
+                {supportsMultiLanguageSpellCheck ? this._renderSpellCheckSection() : null}
                 { discoverySection }
                 {this._renderIntegrationManagerSection() /* Has its own title */}
                 { accountManagementSection }

From fa19adcfe0412afc7ffdc67722f0ad2858e61edb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Thu, 3 Dec 2020 11:50:08 +0100
Subject: [PATCH 023/420] Simplifie

---
 .../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 4d1210dc40..febbcc8e36 100644
--- a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
@@ -401,7 +401,7 @@ export default class GeneralUserSettingsTab extends React.Component {
 
     render() {
         const plaf = PlatformPeg.get();
-        const supportsMultiLanguageSpellCheck = plaf.supportsMultiLanguageSpellCheck() ? true : false;
+        const supportsMultiLanguageSpellCheck = plaf.supportsMultiLanguageSpellCheck();
 
         const discoWarning = this.state.requiredPolicyInfo.hasTerms
             ? <img className='mx_GeneralUserSettingsTab_warningIcon'

From b8008b5f190020e3592be190bd0fae5876aa29dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Thu, 3 Dec 2020 11:50:20 +0100
Subject: [PATCH 024/420] Added in if statement

---
 src/languageHandler.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/languageHandler.tsx b/src/languageHandler.tsx
index 38d3c8347a..985719fce7 100644
--- a/src/languageHandler.tsx
+++ b/src/languageHandler.tsx
@@ -355,7 +355,9 @@ export function setSpellCheckLanguages(preferredLangs: string[]) {
 
 export async function getAvailableSpellCheckLanguages(): Promise<string[]> {
     const plaf = PlatformPeg.get();
-    return plaf.getAvailableSpellCheckLanguages();
+    if (plaf) {
+        return plaf.getAvailableSpellCheckLanguages();
+    }
 }
 
 export function getAllLanguagesFromJson() {

From 89bc4435945bfb207355cf5e5e290925f7d7f7aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Wed, 16 Dec 2020 16:02:27 +0100
Subject: [PATCH 025/420] Fix file drop UI
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 res/css/structures/_MainSplit.scss |  2 +-
 res/css/structures/_RoomView.scss  | 13 +++++--------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/res/css/structures/_MainSplit.scss b/res/css/structures/_MainSplit.scss
index ad1656efbb..3de68b000d 100644
--- a/res/css/structures/_MainSplit.scss
+++ b/res/css/structures/_MainSplit.scss
@@ -22,7 +22,7 @@ limitations under the License.
 }
 
 .mx_MainSplit > .mx_RightPanel_ResizeWrapper {
-    padding: 5px;
+    padding: 0 5px 5px 5px;
     // margin left to not allow the handle to not encroach on the space for the scrollbar
     margin-left: 8px;
     height: calc(100vh - 51px); // height of .mx_RoomHeader.light-panel
diff --git a/res/css/structures/_RoomView.scss b/res/css/structures/_RoomView.scss
index 572c7166d2..0a70b027ae 100644
--- a/res/css/structures/_RoomView.scss
+++ b/res/css/structures/_RoomView.scss
@@ -23,24 +23,21 @@ limitations under the License.
 .mx_RoomView_fileDropTarget {
     min-width: 0px;
     width: 100%;
+    height: 100%;
+
+    margin-left: 6.25px;
+
     font-size: $font-18px;
     text-align: center;
 
     pointer-events: none;
 
-    padding-left: 12px;
-    padding-right: 12px;
-    margin-left: -12px;
-
     border-top-left-radius: 10px;
     border-top-right-radius: 10px;
 
     background-color: $droptarget-bg-color;
-    border: 2px #e1dddd solid;
-    border-bottom: none;
+
     position: absolute;
-    top: 52px;
-    bottom: 0px;
     z-index: 3000;
 }
 

From 41e2ffdf0df43104ef171b690b344a6e22b286f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Wed, 16 Dec 2020 19:51:49 +0100
Subject: [PATCH 026/420] Added background
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 res/css/structures/_RoomView.scss | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/res/css/structures/_RoomView.scss b/res/css/structures/_RoomView.scss
index 0a70b027ae..9292a400bc 100644
--- a/res/css/structures/_RoomView.scss
+++ b/res/css/structures/_RoomView.scss
@@ -39,13 +39,19 @@ limitations under the License.
 
     position: absolute;
     z-index: 3000;
+
+    display: flex;
+    justify-content: center;
+    align-items: center;
 }
 
 .mx_RoomView_fileDropTargetLabel {
-    top: 50%;
-    width: 100%;
-    margin-top: -50px;
     position: absolute;
+
+    border-radius: 10px;
+    padding: 10px;
+
+    background-color: $menu-bg-color;
 }
 
 .mx_RoomView_auxPanel {

From da97d18332c5740499913506b0e059e5b4c7616c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Wed, 16 Dec 2020 21:33:05 +0100
Subject: [PATCH 027/420] Added a comment
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 res/css/structures/_RoomView.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/res/css/structures/_RoomView.scss b/res/css/structures/_RoomView.scss
index 9292a400bc..dd63be3a11 100644
--- a/res/css/structures/_RoomView.scss
+++ b/res/css/structures/_RoomView.scss
@@ -25,6 +25,7 @@ limitations under the License.
     width: 100%;
     height: 100%;
 
+    // This is an ugly fix for centering this element
     margin-left: 6.25px;
 
     font-size: $font-18px;

From dcb30b72b0ed1adc6fb075ee9cc26ca0338177bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Thu, 17 Dec 2020 13:25:22 +0100
Subject: [PATCH 028/420] Fix left panel resizer
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 res/css/structures/_MainSplit.scss     | 32 ++++++++++++++++----------
 res/css/structures/_RoomView.scss      | 12 ++++++----
 src/components/structures/RoomView.tsx | 28 +++++++++++-----------
 3 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/res/css/structures/_MainSplit.scss b/res/css/structures/_MainSplit.scss
index 3de68b000d..6875ef12e0 100644
--- a/res/css/structures/_MainSplit.scss
+++ b/res/css/structures/_MainSplit.scss
@@ -22,22 +22,30 @@ limitations under the License.
 }
 
 .mx_MainSplit > .mx_RightPanel_ResizeWrapper {
-    padding: 0 5px 5px 5px;
-    // margin left to not allow the handle to not encroach on the space for the scrollbar
-    margin-left: 8px;
+    padding: 0 5px 5px 0px;
     height: calc(100vh - 51px); // height of .mx_RoomHeader.light-panel
+    
+    .mx_RightPanel_ResizeHandle {
+        width: 9px;
+    }
 
     &:hover .mx_RightPanel_ResizeHandle {
-        // Need to use important to override element style attributes
-        // set by re-resizable
-        top: 50% !important;
-        transform: translate(0, -50%);
+        &::before {
+            position: absolute;
+            left: 6px;
+            top: 50%;
+            transform: translate(0, -50%);
 
-        height: 64px !important; // to match width of the ones on roomlist
-        width: 4px !important;
-        border-radius: 4px !important;
+            height: 64px;
+            width: 4px;
+            border-radius: 4px;
 
-        background-color: $primary-fg-color;
-        opacity: 0.8;
+            content: ' ';
+
+            background-color: $primary-fg-color;
+            opacity: 0.8;
+
+            margin-left: -10px;
+        }
     }
 }
diff --git a/res/css/structures/_RoomView.scss b/res/css/structures/_RoomView.scss
index dd63be3a11..0a12a86c33 100644
--- a/res/css/structures/_RoomView.scss
+++ b/res/css/structures/_RoomView.scss
@@ -25,9 +25,6 @@ limitations under the License.
     width: 100%;
     height: 100%;
 
-    // This is an ugly fix for centering this element
-    margin-left: 6.25px;
-
     font-size: $font-18px;
     text-align: center;
 
@@ -120,16 +117,23 @@ limitations under the License.
     height: 50px;
 }
 
-.mx_RoomView_body {
+.mx_RoomView_container {
     position: relative; //for .mx_RoomView_auxPanel_fullHeight
     display: flex;
     flex-direction: column;
+}
+
+.mx_RoomView_body {
+    display: flex;
+    flex-direction: column;
     flex: 1;
     min-width: 0;
 
     .mx_RoomView_messagePanel, .mx_RoomView_messagePanelSpinner, .mx_RoomView_messagePanelSearchSpinner {
         order: 2;
     }
+
+    margin-right: 10px;
 }
 
 .mx_RoomView_body .mx_RoomView_timeline {
diff --git a/src/components/structures/RoomView.tsx b/src/components/structures/RoomView.tsx
index 0ee847fbc9..3d62c06e4b 100644
--- a/src/components/structures/RoomView.tsx
+++ b/src/components/structures/RoomView.tsx
@@ -2003,22 +2003,24 @@ export default class RoomView extends React.Component<IProps, IState> {
                             appsShown={this.state.showApps}
                         />
                         <MainSplit panel={rightPanel} resizeNotifier={this.props.resizeNotifier}>
-                            <div className="mx_RoomView_body">
+                            <div className={"mx_RoomView_container"}>
                                 {auxPanel}
-                                <div className={timelineClasses}>
-                                    {topUnreadMessagesBar}
-                                    {jumpToBottom}
-                                    {messagePanel}
-                                    {searchResultsPanel}
-                                </div>
-                                <div className={statusBarAreaClass}>
-                                    <div className="mx_RoomView_statusAreaBox">
-                                        <div className="mx_RoomView_statusAreaBox_line" />
-                                        {statusBar}
+                                <div className="mx_RoomView_body">
+                                    <div className={timelineClasses}>
+                                        {topUnreadMessagesBar}
+                                        {jumpToBottom}
+                                        {messagePanel}
+                                        {searchResultsPanel}
                                     </div>
+                                    <div className={statusBarAreaClass}>
+                                        <div className="mx_RoomView_statusAreaBox">
+                                            <div className="mx_RoomView_statusAreaBox_line" />
+                                            {statusBar}
+                                        </div>
+                                    </div>
+                                    {previewBar}
+                                    {messageComposer}
                                 </div>
-                                {previewBar}
-                                {messageComposer}
                             </div>
                         </MainSplit>
                     </ErrorBoundary>

From e70dee08d0ea7b303a51fb807929376b2dad79dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Thu, 17 Dec 2020 19:50:59 +0100
Subject: [PATCH 029/420] Fix flickering
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 src/components/structures/RoomView.tsx | 42 ++++++++++++++++++++------
 1 file changed, 33 insertions(+), 9 deletions(-)

diff --git a/src/components/structures/RoomView.tsx b/src/components/structures/RoomView.tsx
index 3d62c06e4b..67f9663597 100644
--- a/src/components/structures/RoomView.tsx
+++ b/src/components/structures/RoomView.tsx
@@ -187,6 +187,7 @@ export interface IState {
     rejecting?: boolean;
     rejectError?: Error;
     hasPinnedWidgets?: boolean;
+    dragCounter: number;
 }
 
 export default class RoomView extends React.Component<IProps, IState> {
@@ -237,6 +238,7 @@ export default class RoomView extends React.Component<IProps, IState> {
             canReply: false,
             useIRCLayout: SettingsStore.getValue("useIRCLayout"),
             matrixClientIsReady: this.context && this.context.isInitialSyncComplete(),
+            dragCounter: 0,
         };
 
         this.dispatcherRef = dis.register(this.onAction);
@@ -525,8 +527,8 @@ export default class RoomView extends React.Component<IProps, IState> {
             if (!roomView.ondrop) {
                 roomView.addEventListener('drop', this.onDrop);
                 roomView.addEventListener('dragover', this.onDragOver);
-                roomView.addEventListener('dragleave', this.onDragLeaveOrEnd);
-                roomView.addEventListener('dragend', this.onDragLeaveOrEnd);
+                roomView.addEventListener('dragenter', this.onDragEnter);
+                roomView.addEventListener('dragleave', this.onDragLeave);
             }
         }
 
@@ -1108,6 +1110,31 @@ export default class RoomView extends React.Component<IProps, IState> {
         this.updateTopUnreadMessagesBar();
     };
 
+    private onDragEnter = ev => {
+        ev.stopPropagation();
+        ev.preventDefault();
+
+        this.setState({
+            dragCounter: this.state.dragCounter + 1,
+            draggingFile: true,
+        });
+    };
+
+    private onDragLeave = ev => {
+        ev.stopPropagation();
+        ev.preventDefault();
+
+        this.setState({
+            dragCounter: this.state.dragCounter - 1,
+        });
+
+        if (this.state.dragCounter == 0) {
+            this.setState({
+                draggingFile: false,
+            });
+        }
+    };
+
     private onDragOver = ev => {
         ev.stopPropagation();
         ev.preventDefault();
@@ -1115,7 +1142,6 @@ export default class RoomView extends React.Component<IProps, IState> {
         ev.dataTransfer.dropEffect = 'none';
 
         if (ev.dataTransfer.types.includes("Files") || ev.dataTransfer.types.includes("application/x-moz-file")) {
-            this.setState({ draggingFile: true });
             ev.dataTransfer.dropEffect = 'copy';
         }
     };
@@ -1126,14 +1152,12 @@ export default class RoomView extends React.Component<IProps, IState> {
         ContentMessages.sharedInstance().sendContentListToRoom(
             ev.dataTransfer.files, this.state.room.roomId, this.context,
         );
-        this.setState({ draggingFile: false });
         dis.fire(Action.FocusComposer);
-    };
 
-    private onDragLeaveOrEnd = ev => {
-        ev.stopPropagation();
-        ev.preventDefault();
-        this.setState({ draggingFile: false });
+        this.setState({
+            draggingFile: false,
+            dragCounter: this.state.dragCounter - 1,
+        });
     };
 
     private injectSticker(url, info, text) {

From 044e02b06ad46b417d3aa8fc33f24c1374fdcb56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Thu, 17 Dec 2020 20:16:53 +0100
Subject: [PATCH 030/420] Remove spaces in empty line
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 res/css/structures/_MainSplit.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/structures/_MainSplit.scss b/res/css/structures/_MainSplit.scss
index 6875ef12e0..f05f24d0d7 100644
--- a/res/css/structures/_MainSplit.scss
+++ b/res/css/structures/_MainSplit.scss
@@ -24,7 +24,7 @@ limitations under the License.
 .mx_MainSplit > .mx_RightPanel_ResizeWrapper {
     padding: 0 5px 5px 0px;
     height: calc(100vh - 51px); // height of .mx_RoomHeader.light-panel
-    
+
     .mx_RightPanel_ResizeHandle {
         width: 9px;
     }

From 365d252d3f0eb64755f502318c95f855a4404f56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Thu, 17 Dec 2020 20:25:12 +0100
Subject: [PATCH 031/420] Fix removing event listeners
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 src/components/structures/RoomView.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/RoomView.tsx b/src/components/structures/RoomView.tsx
index 67f9663597..d910940a73 100644
--- a/src/components/structures/RoomView.tsx
+++ b/src/components/structures/RoomView.tsx
@@ -572,8 +572,8 @@ export default class RoomView extends React.Component<IProps, IState> {
             const roomView = this.roomView.current;
             roomView.removeEventListener('drop', this.onDrop);
             roomView.removeEventListener('dragover', this.onDragOver);
-            roomView.removeEventListener('dragleave', this.onDragLeaveOrEnd);
-            roomView.removeEventListener('dragend', this.onDragLeaveOrEnd);
+            roomView.removeEventListener('dragenter', this.onDragEnter);
+            roomView.removeEventListener('dragleave', this.onDragLeave);
         }
         dis.unregister(this.dispatcherRef);
         if (this.context) {

From 5d7e45e6cf85e14f4143923f7e29642f97965fc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Thu, 17 Dec 2020 20:29:33 +0100
Subject: [PATCH 032/420] Added dragCounter
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 src/contexts/RoomContext.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/contexts/RoomContext.ts b/src/contexts/RoomContext.ts
index 082dcc4e6b..1b9097e337 100644
--- a/src/contexts/RoomContext.ts
+++ b/src/contexts/RoomContext.ts
@@ -42,6 +42,7 @@ const RoomContext = createContext<IState>({
     canReply: false,
     useIRCLayout: false,
     matrixClientIsReady: false,
+    dragCounter: 0,
 });
 RoomContext.displayName = "RoomContext";
 export default RoomContext;

From 5de92b68d954ba3f997f2d5713d954ee05303b2e Mon Sep 17 00:00:00 2001
From: Will Hunt <willh@matrix.org>
Date: Wed, 27 Jan 2021 11:39:57 +0000
Subject: [PATCH 033/420] Show a specific error for hs_disabled

---
 src/components/structures/LoggedInView.tsx      | 2 +-
 src/components/structures/RoomStatusBar.js      | 4 ++++
 src/components/structures/auth/Login.tsx        | 3 +++
 src/components/structures/auth/Registration.tsx | 1 +
 src/toasts/ServerLimitToast.tsx                 | 1 +
 src/utils/ErrorUtils.js                         | 1 +
 6 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx
index 70ec2b7033..508b7f05e7 100644
--- a/src/components/structures/LoggedInView.tsx
+++ b/src/components/structures/LoggedInView.tsx
@@ -94,7 +94,7 @@ interface IProps {
 
 interface IUsageLimit {
     // eslint-disable-next-line camelcase
-    limit_type: "monthly_active_user" | string;
+    limit_type: "monthly_active_user" | "hs_disabled" | string;
     // eslint-disable-next-line camelcase
     admin_contact?: string;
 }
diff --git a/src/components/structures/RoomStatusBar.js b/src/components/structures/RoomStatusBar.js
index c1c4ad6292..aa4bceba74 100644
--- a/src/components/structures/RoomStatusBar.js
+++ b/src/components/structures/RoomStatusBar.js
@@ -195,6 +195,10 @@ export default class RoomStatusBar extends React.Component {
                     "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.",
                 ),
+                'hs_disabled': _td(
+                    "Your message wasn't sent because this homeserver has been blocked by it's administrator. " +
+                    "Please <a>contact your service administrator</a> to continue using the service.",
+                ),
                 '': _td(
                     "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.",
diff --git a/src/components/structures/auth/Login.tsx b/src/components/structures/auth/Login.tsx
index 606aeb44ab..a9fd363763 100644
--- a/src/components/structures/auth/Login.tsx
+++ b/src/components/structures/auth/Login.tsx
@@ -218,6 +218,9 @@ export default class LoginComponent extends React.PureComponent<IProps, IState>
                         'monthly_active_user': _td(
                             "This homeserver has hit its Monthly Active User limit.",
                         ),
+                        'hs_blocked': _td(
+                            "This homeserver has been blocked by it's administrator.",
+                        ),
                         '': _td(
                             "This homeserver has exceeded one of its resource limits.",
                         ),
diff --git a/src/components/structures/auth/Registration.tsx b/src/components/structures/auth/Registration.tsx
index 095f3d3433..f9d338902c 100644
--- a/src/components/structures/auth/Registration.tsx
+++ b/src/components/structures/auth/Registration.tsx
@@ -276,6 +276,7 @@ export default class Registration extends React.Component<IProps, IState> {
                     response.data.admin_contact,
                     {
                         'monthly_active_user': _td("This homeserver has hit its Monthly Active User limit."),
+                        'hs_blocked': _td("This homeserver has been blocked by it's administrator."),
                         '': _td("This homeserver has exceeded one of its resource limits."),
                     },
                 );
diff --git a/src/toasts/ServerLimitToast.tsx b/src/toasts/ServerLimitToast.tsx
index d35140be3d..9dbe8c05f1 100644
--- a/src/toasts/ServerLimitToast.tsx
+++ b/src/toasts/ServerLimitToast.tsx
@@ -26,6 +26,7 @@ const TOAST_KEY = "serverlimit";
 export const showToast = (limitType: string, adminContact?: string, syncError?: boolean) => {
     const errorText = messageForResourceLimitError(limitType, adminContact, {
         'monthly_active_user': _td("Your homeserver has exceeded its user limit."),
+        'hs_blocked': _td("This homeserver has been blocked by it's administrator."),
         '': _td("Your homeserver has exceeded one of its resource limits."),
     });
     const contactText = messageForResourceLimitError(limitType, adminContact, {
diff --git a/src/utils/ErrorUtils.js b/src/utils/ErrorUtils.js
index f0a4d7c49e..2c6acd5503 100644
--- a/src/utils/ErrorUtils.js
+++ b/src/utils/ErrorUtils.js
@@ -62,6 +62,7 @@ export function messageForSyncError(err) {
             err.data.admin_contact,
             {
                 'monthly_active_user': _td("This homeserver has hit its Monthly Active User limit."),
+                'hs_blocked': _td("This homeserver has been blocked by its administrator."),
                 '': _td("This homeserver has exceeded one of its resource limits."),
             },
         );

From 27724a93d28d7945e49f94b5fa1158095bd84d8d Mon Sep 17 00:00:00 2001
From: Will Hunt <willh@matrix.org>
Date: Wed, 27 Jan 2021 11:42:36 +0000
Subject: [PATCH 034/420] new strings

---
 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 8d047ea3f1..e55ab581ca 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -650,6 +650,7 @@
     "Unexpected error resolving identity server configuration": "Unexpected error resolving identity server configuration",
     "The message you are trying to send is too large.": "The message you are trying to send is too large.",
     "This homeserver has hit its Monthly Active User limit.": "This homeserver has hit its Monthly Active User limit.",
+    "This homeserver has been blocked by its administrator.": "This homeserver has been blocked by its administrator.",
     "This homeserver has exceeded one of its resource limits.": "This homeserver has exceeded one of its resource limits.",
     "Please <a>contact your service administrator</a> to continue using the service.": "Please <a>contact your service administrator</a> to continue using the service.",
     "Unable to connect to Homeserver. Retrying...": "Unable to connect to Homeserver. Retrying...",
@@ -727,6 +728,7 @@
     "Enable desktop notifications": "Enable desktop notifications",
     "Enable": "Enable",
     "Your homeserver has exceeded its user limit.": "Your homeserver has exceeded its user limit.",
+    "This homeserver has been blocked by it's administrator.": "This homeserver has been blocked by it's administrator.",
     "Your homeserver has exceeded one of its resource limits.": "Your homeserver has exceeded one of its resource limits.",
     "Contact your <a>server admin</a>.": "Contact your <a>server admin</a>.",
     "Warning": "Warning",
@@ -2471,6 +2473,7 @@
     "Filter rooms and people": "Filter rooms and people",
     "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.",
     "Your message wasn't sent because this homeserver has hit its Monthly Active User Limit. Please <a>contact your service administrator</a> to continue using the service.": "Your message wasn't sent because this homeserver has hit its Monthly Active User Limit. Please <a>contact your service administrator</a> to continue using the service.",
+    "Your message wasn't sent because this homeserver has been blocked by it's administrator. Please <a>contact your service administrator</a> to continue using the service.": "Your message wasn't sent because this homeserver has been blocked by it's administrator. Please <a>contact your service administrator</a> to continue using the service.",
     "Your message wasn't sent because this homeserver has exceeded a resource limit. Please <a>contact your service administrator</a> to continue using the service.": "Your message wasn't sent because this homeserver has exceeded a resource limit. Please <a>contact your service administrator</a> to continue using the service.",
     "%(count)s of your messages have not been sent.|other": "Some of your messages have not been sent.",
     "%(count)s of your messages have not been sent.|one": "Your message was not sent.",

From cc38bcf333bc9fdd7d8ebc7d0b4d06330ba7e359 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Sat, 6 Feb 2021 15:09:21 +0100
Subject: [PATCH 035/420] Display room name
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 src/components/views/elements/Pill.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js
index daa4cb70e2..f1527c48b1 100644
--- a/src/components/views/elements/Pill.js
+++ b/src/components/views/elements/Pill.js
@@ -226,7 +226,7 @@ class Pill extends React.Component {
             case Pill.TYPE_ROOM_MENTION: {
                 const room = this.state.room;
                 if (room) {
-                    linkText = resource;
+                    linkText = room.name;
                     if (this.props.shouldShowPillAvatar) {
                         avatar = <RoomAvatar room={room} width={16} height={16} aria-hidden="true" />;
                     }

From ffc0230ab4eb3902bdd6e22280f78c8b0870ba54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Sat, 6 Feb 2021 19:09:34 +0100
Subject: [PATCH 036/420] Use resource as a fallback
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is useful mainly for the tests they would otherwise fail as there is no room name to display while the tests are run.

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 src/components/views/elements/Pill.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js
index f1527c48b1..cbbe562754 100644
--- a/src/components/views/elements/Pill.js
+++ b/src/components/views/elements/Pill.js
@@ -226,7 +226,7 @@ class Pill extends React.Component {
             case Pill.TYPE_ROOM_MENTION: {
                 const room = this.state.room;
                 if (room) {
-                    linkText = room.name;
+                    linkText = room.name || resource;
                     if (this.props.shouldShowPillAvatar) {
                         avatar = <RoomAvatar room={room} width={16} height={16} aria-hidden="true" />;
                     }

From 33979b335446bf16bd02815ae88de7241540ed74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Fri, 12 Feb 2021 08:18:27 +0100
Subject: [PATCH 037/420] Added a tooltip
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 src/components/views/elements/Pill.js | 39 +++++++++++++++++++++++++--
 1 file changed, 37 insertions(+), 2 deletions(-)

diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js
index cbbe562754..5b3189f389 100644
--- a/src/components/views/elements/Pill.js
+++ b/src/components/views/elements/Pill.js
@@ -26,6 +26,7 @@ import FlairStore from "../../../stores/FlairStore";
 import {getPrimaryPermalinkEntity, parseAppLocalLink} from "../../../utils/permalinks/Permalinks";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import {Action} from "../../../dispatcher/actions";
+import Tooltip from './Tooltip';
 
 class Pill extends React.Component {
     static roomNotifPos(text) {
@@ -68,6 +69,8 @@ class Pill extends React.Component {
         group: null,
         // The room related to the room pill
         room: null,
+        // Is the user hovering the pill
+        hover: false,
     };
 
     // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
@@ -154,6 +157,18 @@ class Pill extends React.Component {
         this._unmounted = true;
     }
 
+    onMouseOver = () => {
+        this.setState({
+            hover: true,
+        });
+    };
+
+    onMouseLeave = () => {
+        this.setState({
+            hover: false,
+        });
+    };
+
     doProfileLookup(userId, member) {
         MatrixClientPeg.get().getProfileInfo(userId).then((resp) => {
             if (this._unmounted) {
@@ -256,16 +271,36 @@ class Pill extends React.Component {
         });
 
         if (this.state.pillType) {
+            const {yOffset} = this.props;
+
+            let tip;
+            if (this.state.hover) {
+                tip = <Tooltip label={resource} yOffset={yOffset} />;
+            }
+
             return <MatrixClientContext.Provider value={this._matrixClient}>
                 { this.props.inMessage ?
-                    <a className={classes} href={href} onClick={onClick} title={resource} data-offset-key={this.props.offsetKey}>
+                    <a
+                        className={classes}
+                        href={href}
+                        onClick={onClick}
+                        data-offset-key={this.props.offsetKey}
+                        onMouseOver={this.onMouseOver}
+                        onMouseLeave={this.onMouseLeave}
+                    >
                         { avatar }
                         { linkText }
                     </a> :
-                    <span className={classes} title={resource} data-offset-key={this.props.offsetKey}>
+                    <span
+                        className={classes}
+                        data-offset-key={this.props.offsetKey}
+                        onMouseOver={this.onMouseOver}
+                        onMouseLeave={this.onMouseLeave}
+                    >
                         { avatar }
                         { linkText }
                     </span> }
+                {tip}
             </MatrixClientContext.Provider>;
         } else {
             // Deliberately render nothing if the URL isn't recognised

From a975de22efca2302aa5302b5d0142aafd235a701 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Fri, 12 Feb 2021 11:27:14 +0100
Subject: [PATCH 038/420] Fixed buggy tooltip
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 src/components/views/elements/Pill.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js
index 5b3189f389..68a87d40b9 100644
--- a/src/components/views/elements/Pill.js
+++ b/src/components/views/elements/Pill.js
@@ -290,6 +290,7 @@ class Pill extends React.Component {
                     >
                         { avatar }
                         { linkText }
+                        { tip }
                     </a> :
                     <span
                         className={classes}
@@ -299,8 +300,8 @@ class Pill extends React.Component {
                     >
                         { avatar }
                         { linkText }
+                        { tip }
                     </span> }
-                {tip}
             </MatrixClientContext.Provider>;
         } else {
             // Deliberately render nothing if the URL isn't recognised

From a075568e895c0e2b3e9e83c710cbc9c510b488bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Fri, 12 Feb 2021 11:34:09 +0100
Subject: [PATCH 039/420] Fixed tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In the previous commits I have removed the native title/tooltip so it needs to be removed from the tests as well

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 test/components/views/messages/TextualBody-test.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/components/views/messages/TextualBody-test.js b/test/components/views/messages/TextualBody-test.js
index d5b80b6756..a596825c09 100644
--- a/test/components/views/messages/TextualBody-test.js
+++ b/test/components/views/messages/TextualBody-test.js
@@ -208,7 +208,7 @@ describe("<TextualBody />", () => {
             const content = wrapper.find(".mx_EventTile_body");
             expect(content.html()).toBe('<span class="mx_EventTile_body markdown-body" dir="auto">' +
                 'Hey <span>' +
-                '<a class="mx_Pill mx_UserPill" title="@user:server">' +
+                '<a class="mx_Pill mx_UserPill">' +
                 '<img class="mx_BaseAvatar mx_BaseAvatar_image" src="mxc://avatar.url/image.png" ' +
                 'style="width: 16px; height: 16px;" title="@member:domain.bla" alt="" aria-hidden="true">Member</a>' +
                 '</span></span>');
@@ -267,8 +267,8 @@ describe("<TextualBody />", () => {
             expect(content.html()).toBe(
                 '<span class="mx_EventTile_body markdown-body" dir="auto">' +
                 'A <span><a class="mx_Pill mx_RoomPill" href="#/room/!ZxbRYPQXDXKGmDnJNg:example.com' +
-                '?via=example.com&amp;via=bob.com" ' +
-                'title="!ZxbRYPQXDXKGmDnJNg:example.com"><img class="mx_BaseAvatar mx_BaseAvatar_image" ' +
+                '?via=example.com&amp;via=bob.com"' +
+                '><img class="mx_BaseAvatar mx_BaseAvatar_image" ' +
                 'src="mxc://avatar.url/room.png" ' +
                 'style="width: 16px; height: 16px;" alt="" aria-hidden="true">' +
                 '!ZxbRYPQXDXKGmDnJNg:example.com</a></span> with vias</span>',

From cb5237a18be0bf17eede4768f8978dfc44e7c609 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Fri, 12 Feb 2021 14:21:07 +0100
Subject: [PATCH 040/420] Display room name instead of alias
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 src/editor/parts.ts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/editor/parts.ts b/src/editor/parts.ts
index 8a7ccfcb7b..67f6a2c0c5 100644
--- a/src/editor/parts.ts
+++ b/src/editor/parts.ts
@@ -329,8 +329,8 @@ class NewlinePart extends BasePart implements IBasePart {
 }
 
 class RoomPillPart extends PillPart {
-    constructor(displayAlias, private room: Room) {
-        super(displayAlias, displayAlias);
+    constructor(resourceId: string, label: string, private room: Room) {
+        super(resourceId, label);
     }
 
     setAvatar(node: HTMLElement) {
@@ -357,6 +357,10 @@ class RoomPillPart extends PillPart {
 }
 
 class AtRoomPillPart extends RoomPillPart {
+    constructor(text: string, room: Room) {
+        super(text, text, room);
+    }
+
     get type(): IPillPart["type"] {
         return Type.AtRoomPill;
     }
@@ -521,7 +525,7 @@ export class PartCreator {
                        r.getAltAliases().includes(alias);
             });
         }
-        return new RoomPillPart(alias, room);
+        return new RoomPillPart(alias, room ? room.name : alias, room);
     }
 
     atRoomPill(text: string) {

From d8a9b84af94fac4321d700a9c9bfee29763e7fd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Fri, 12 Feb 2021 14:28:39 +0100
Subject: [PATCH 041/420] Don't show tooltip if there is nothing to display
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We do this because resource is undefined for @room

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 src/components/views/elements/Pill.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js
index 68a87d40b9..c6806c289e 100644
--- a/src/components/views/elements/Pill.js
+++ b/src/components/views/elements/Pill.js
@@ -274,7 +274,7 @@ class Pill extends React.Component {
             const {yOffset} = this.props;
 
             let tip;
-            if (this.state.hover) {
+            if (this.state.hover && resource) {
                 tip = <Tooltip label={resource} yOffset={yOffset} />;
             }
 

From f420c8598516b4f939b7ab90f5fa263db2aaa94a Mon Sep 17 00:00:00 2001
From: Jaiwanth <jaiwanth2011@gmail.com>
Date: Mon, 15 Feb 2021 19:13:09 +0530
Subject: [PATCH 042/420] Added invite option to room's context menu

Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
---
 res/css/views/rooms/_RoomTile.scss      |  4 ++++
 src/components/views/rooms/RoomTile.tsx | 17 ++++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/res/css/views/rooms/_RoomTile.scss b/res/css/views/rooms/_RoomTile.scss
index 8eca3f1efa..377b207490 100644
--- a/res/css/views/rooms/_RoomTile.scss
+++ b/res/css/views/rooms/_RoomTile.scss
@@ -188,6 +188,10 @@ limitations under the License.
     .mx_RoomTile_iconSettings::before {
         mask-image: url('$(res)/img/element-icons/settings.svg');
     }
+    
+    .mx_RoomTile_iconInvite::before {
+        mask-image: url('$(res)/img/element-icons/room/invite.svg');
+    }
 
     .mx_RoomTile_iconSignOut::before {
         mask-image: url('$(res)/img/element-icons/leave.svg');
diff --git a/src/components/views/rooms/RoomTile.tsx b/src/components/views/rooms/RoomTile.tsx
index 835447dc18..3a34a0daaa 100644
--- a/src/components/views/rooms/RoomTile.tsx
+++ b/src/components/views/rooms/RoomTile.tsx
@@ -331,6 +331,17 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
         this.setState({generalMenuPosition: null}); // hide the menu
     };
 
+    private onInviteClick = (ev: ButtonEvent) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+
+        dis.dispatch({
+            action: 'view_invite',
+            roomId: this.props.room.roomId,
+        });
+        this.setState({generalMenuPosition: null}); // hide the menu
+    };
+
     private async saveNotifState(ev: ButtonEvent, newState: Volume) {
         ev.preventDefault();
         ev.stopPropagation();
@@ -470,7 +481,11 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
                         label={lowPriorityLabel}
                         iconClassName="mx_RoomTile_iconArrowDown"
                     />
-
+                    <IconizedContextMenuOption
+                        onClick={this.onInviteClick}
+                        label={_t("Invite to this room")}
+                        iconClassName="mx_RoomTile_iconInvite"
+                    />
                     <IconizedContextMenuOption
                         onClick={this.onOpenRoomSettings}
                         label={_t("Settings")}

From 04d2bf1d6a5b6fae7672dccd29fc85e8b5145bd3 Mon Sep 17 00:00:00 2001
From: Jaiwanth <jaiwanth2011@gmail.com>
Date: Mon, 15 Feb 2021 20:52:19 +0530
Subject: [PATCH 043/420] Check whether user has permission to invite

Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
---
 res/css/views/rooms/_RoomTile.scss      |  2 +-
 src/components/views/rooms/RoomTile.tsx | 22 +++++++++++++++++-----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/res/css/views/rooms/_RoomTile.scss b/res/css/views/rooms/_RoomTile.scss
index 377b207490..72d29dfd4c 100644
--- a/res/css/views/rooms/_RoomTile.scss
+++ b/res/css/views/rooms/_RoomTile.scss
@@ -188,7 +188,7 @@ limitations under the License.
     .mx_RoomTile_iconSettings::before {
         mask-image: url('$(res)/img/element-icons/settings.svg');
     }
-    
+
     .mx_RoomTile_iconInvite::before {
         mask-image: url('$(res)/img/element-icons/room/invite.svg');
     }
diff --git a/src/components/views/rooms/RoomTile.tsx b/src/components/views/rooms/RoomTile.tsx
index 3a34a0daaa..f168235335 100644
--- a/src/components/views/rooms/RoomTile.tsx
+++ b/src/components/views/rooms/RoomTile.tsx
@@ -462,6 +462,16 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
             const isLowPriority = roomTags.includes(DefaultTagID.LowPriority);
             const lowPriorityLabel = _t("Low Priority");
 
+            const inRoom = this.props.room && this.props.room.getMyMembership() === "join";
+            const userId = MatrixClientPeg.get().getUserId();
+            let canInvite = inRoom;
+            const powerLevels = this.props.room.currentState
+                .getStateEvents("m.room.power_levels", "")
+                ?.getContent();
+            const me = this.props.room.getMember(userId);
+            if (powerLevels && me && powerLevels.invite > me.powerLevel) {
+                canInvite = false;
+            }
             contextMenu = <IconizedContextMenu
                 {...contextMenuBelow(this.state.generalMenuPosition)}
                 onFinished={this.onCloseGeneralMenu}
@@ -481,11 +491,13 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
                         label={lowPriorityLabel}
                         iconClassName="mx_RoomTile_iconArrowDown"
                     />
-                    <IconizedContextMenuOption
-                        onClick={this.onInviteClick}
-                        label={_t("Invite to this room")}
-                        iconClassName="mx_RoomTile_iconInvite"
-                    />
+                    {canInvite ? (
+                        <IconizedContextMenuOption
+                            onClick={this.onInviteClick}
+                            label={_t("Invite to this room")}
+                            iconClassName="mx_RoomTile_iconInvite"
+                        />
+                    ) : null}
                     <IconizedContextMenuOption
                         onClick={this.onOpenRoomSettings}
                         label={_t("Settings")}

From ee543277335320cf107dfa421d87952a247b4a8c Mon Sep 17 00:00:00 2001
From: Jaiwanth <jaiwanth2011@gmail.com>
Date: Tue, 16 Feb 2021 18:59:22 +0530
Subject: [PATCH 044/420] Update src/components/views/rooms/RoomTile.tsx

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

diff --git a/src/components/views/rooms/RoomTile.tsx b/src/components/views/rooms/RoomTile.tsx
index f168235335..3894f557fc 100644
--- a/src/components/views/rooms/RoomTile.tsx
+++ b/src/components/views/rooms/RoomTile.tsx
@@ -462,7 +462,7 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
             const isLowPriority = roomTags.includes(DefaultTagID.LowPriority);
             const lowPriorityLabel = _t("Low Priority");
 
-            const inRoom = this.props.room && this.props.room.getMyMembership() === "join";
+            const inRoom = this.props.room.getMyMembership() === "join";
             const userId = MatrixClientPeg.get().getUserId();
             let canInvite = inRoom;
             const powerLevels = this.props.room.currentState

From 21b9ab9d8595ffbdb881e8c4e4ae33d9829d0dcb Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 16 Feb 2021 15:17:51 -0700
Subject: [PATCH 045/420] Add an optional config option to make the welcome
 page the login page

This is commonly requested by deployments with custom setups or those using SSO. Instead of having them all ship the same welcome.html with redirect code in it, we can offer a built-in redirect.

Note that this doesn't actually redirect and instead just replaces the view. This is to make the change less invasive as otherwise it involves changing the routing layers.
---
 src/components/structures/MatrixChat.tsx |  6 ++++--
 src/utils/{pages.js => pages.ts}         | 17 +++++++++++------
 2 files changed, 15 insertions(+), 8 deletions(-)
 rename src/utils/{pages.js => pages.ts} (68%)

diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index 5045e44182..35e08e8d37 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -82,6 +82,7 @@ import {UIFeature} from "../../settings/UIFeature";
 import { CommunityPrototypeStore } from "../../stores/CommunityPrototypeStore";
 import DialPadModal from "../views/voip/DialPadModal";
 import { showToast as showMobileGuideToast } from '../../toasts/MobileGuideToast';
+import { shouldUseLoginForWelcome } from "../../utils/pages";
 
 /** constants for MatrixChat.state.view */
 export enum Views {
@@ -1988,7 +1989,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                     </div>
                 );
             }
-        } else if (this.state.view === Views.WELCOME) {
+        } else if (this.state.view === Views.WELCOME && !shouldUseLoginForWelcome(SdkConfig.get())) {
             const Welcome = sdk.getComponent('auth.Welcome');
             view = <Welcome />;
         } else if (this.state.view === Views.REGISTER && SettingsStore.getValue(UIFeature.Registration)) {
@@ -2020,7 +2021,8 @@ 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
+            || (this.state.view === Views.WELCOME && shouldUseLoginForWelcome(SdkConfig.get()))) {
             const showPasswordReset = SettingsStore.getValue(UIFeature.PasswordReset);
             const Login = sdk.getComponent('structures.auth.Login');
             view = (
diff --git a/src/utils/pages.js b/src/utils/pages.ts
similarity index 68%
rename from src/utils/pages.js
rename to src/utils/pages.ts
index d63ca3f2c7..bae76be29d 100644
--- a/src/utils/pages.js
+++ b/src/utils/pages.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 New Vector Ltd
+Copyright 2019, 2021 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-export function getHomePageUrl(appConfig) {
+import { ConfigOptions } from "../SdkConfig";
+
+export function getHomePageUrl(appConfig: ConfigOptions): string | null {
     const pagesConfig = appConfig.embeddedPages;
-    let pageUrl = null;
-    if (pagesConfig) {
-        pageUrl = pagesConfig.homeUrl;
-    }
+    let pageUrl = pagesConfig?.homeUrl;
+
     if (!pageUrl) {
         // This is a deprecated config option for the home page
         // (despite the name, given we also now have a welcome
@@ -29,3 +29,8 @@ export function getHomePageUrl(appConfig) {
 
     return pageUrl;
 }
+
+export function shouldUseLoginForWelcome(appConfig: ConfigOptions): boolean {
+    const pagesConfig = appConfig.embeddedPages;
+    return pagesConfig?.loginForWelcome === true;
+}

From 5de99c7708c58b2808d288160ce8fb69f4f5027c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Thu, 18 Feb 2021 19:40:24 +0100
Subject: [PATCH 046/420] Fix licenses
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 res/css/views/settings/_SpellCheckLanguages.scss              | 3 +--
 src/components/views/elements/SpellCheckLanguagesDropdown.tsx | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/res/css/views/settings/_SpellCheckLanguages.scss b/res/css/views/settings/_SpellCheckLanguages.scss
index ddfa0bf9e0..bb322c983f 100644
--- a/res/css/views/settings/_SpellCheckLanguages.scss
+++ b/res/css/views/settings/_SpellCheckLanguages.scss
@@ -1,6 +1,5 @@
 /*
-Copyright 2019 New Vector Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2021 Šimon Brandner <simon.bra.ag@gmail.com>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/src/components/views/elements/SpellCheckLanguagesDropdown.tsx b/src/components/views/elements/SpellCheckLanguagesDropdown.tsx
index 53c3f310b7..029d162573 100644
--- a/src/components/views/elements/SpellCheckLanguagesDropdown.tsx
+++ b/src/components/views/elements/SpellCheckLanguagesDropdown.tsx
@@ -1,6 +1,5 @@
 /*
-Copyright 2017 Marcel Radzio (MTRNord)
-Copyright 2017 Vector Creations Ltd.
+Copyright 2021 Šimon Brandner <simon.bra.ag@gmail.com>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

From ed02503462d93e43659bddd3280a19a0b31e26f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Thu, 18 Feb 2021 19:41:19 +0100
Subject: [PATCH 047/420] Fix one more license
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 src/components/views/settings/SpellCheckSettings.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/settings/SpellCheckSettings.tsx b/src/components/views/settings/SpellCheckSettings.tsx
index bfe0774570..d08f263b5f 100644
--- a/src/components/views/settings/SpellCheckSettings.tsx
+++ b/src/components/views/settings/SpellCheckSettings.tsx
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 New Vector Ltd
+Copyright 2021 Šimon Brandner <simon.bra.ag@gmail.com>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

From 2ebc1252cbbfc9731dc412947287ef5e4c9ce460 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Thu, 18 Feb 2021 19:54:54 +0100
Subject: [PATCH 048/420] Removed unnecessary functions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 .../elements/SpellCheckLanguagesDropdown.tsx  | 37 ++++++++++---------
 .../tabs/user/GeneralUserSettingsTab.js       |  6 ++-
 src/languageHandler.tsx                       | 14 -------
 3 files changed, 25 insertions(+), 32 deletions(-)

diff --git a/src/components/views/elements/SpellCheckLanguagesDropdown.tsx b/src/components/views/elements/SpellCheckLanguagesDropdown.tsx
index 029d162573..c647f6e410 100644
--- a/src/components/views/elements/SpellCheckLanguagesDropdown.tsx
+++ b/src/components/views/elements/SpellCheckLanguagesDropdown.tsx
@@ -18,7 +18,7 @@ import React from 'react';
 
 import Dropdown from "../../views/elements/Dropdown"
 import * as sdk from '../../../index';
-import * as languageHandler from '../../../languageHandler';
+import PlatformPeg from "../../../PlatformPeg";
 import SettingsStore from "../../../settings/SettingsStore";
 import { _t } from "../../../languageHandler";
 
@@ -52,23 +52,26 @@ export default class SpellCheckLanguagesDropdown extends React.Component<SpellCh
     }
 
     componentDidMount() {
-        languageHandler.getAvailableSpellCheckLanguages().then((languages) => {
-            languages.sort(function(a, b) {
-                if (a < b) return -1;
-                if (a > b) return 1;
-                return 0;
-            });
-            const langs = [];
-            languages.forEach((language) => {
-                langs.push({
-                    label: language,
-                    value: language,
+        const plaf = PlatformPeg.get();
+        if (plaf) {
+            plaf.getAvailableSpellCheckLanguages().then((languages) => {
+                languages.sort(function(a, b) {
+                    if (a < b) return -1;
+                    if (a > b) return 1;
+                    return 0;
+                });
+                const langs = [];
+                languages.forEach((language) => {
+                    langs.push({
+                        label: language,
+                        value: language,
+                    })
                 })
-            })
-            this.setState({languages: langs});
-        }).catch((e) => {
-            this.setState({languages: ['en']});
-        });
+                this.setState({languages: langs});
+            }).catch((e) => {
+                this.setState({languages: ['en']});
+            });
+        }
     }
 
     _onSearchChange(search) {
diff --git a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
index febbcc8e36..e87dca88c8 100644
--- a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
@@ -188,7 +188,10 @@ export default class GeneralUserSettingsTab extends React.Component {
         SettingsStore.setValue("spell-check-languages", null, SettingLevel.DEVICE, languages);
         this.setState({spellCheckLanguages: languages});
 
-        languageHandler.setSpellCheckLanguages(languages);
+        const plaf = PlatformPeg.get();
+        if (plaf) {
+            plaf.setSpellCheckLanguages(languages);
+        }
     };
 
     _onPasswordChangeError = (err) => {
@@ -402,6 +405,7 @@ export default class GeneralUserSettingsTab extends React.Component {
     render() {
         const plaf = PlatformPeg.get();
         const supportsMultiLanguageSpellCheck = plaf.supportsMultiLanguageSpellCheck();
+        console.log("LOG", supportsMultiLanguageSpellCheck);
 
         const discoWarning = this.state.requiredPolicyInfo.hasTerms
             ? <img className='mx_GeneralUserSettingsTab_warningIcon'
diff --git a/src/languageHandler.tsx b/src/languageHandler.tsx
index 985719fce7..b61f57d4b3 100644
--- a/src/languageHandler.tsx
+++ b/src/languageHandler.tsx
@@ -346,20 +346,6 @@ export function setLanguage(preferredLangs: string | string[]) {
     });
 }
 
-export function setSpellCheckLanguages(preferredLangs: string[]) {
-    const plaf = PlatformPeg.get();
-    if (plaf) {
-        plaf.setSpellCheckLanguages(preferredLangs);
-    }
-}
-
-export async function getAvailableSpellCheckLanguages(): Promise<string[]> {
-    const plaf = PlatformPeg.get();
-    if (plaf) {
-        return plaf.getAvailableSpellCheckLanguages();
-    }
-}
-
 export function getAllLanguagesFromJson() {
     return getLangsJson().then((langsObject) => {
         const langs = [];

From 305d64cda88aebef8e2a0e799606224baeac4dc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Thu, 18 Feb 2021 20:09:39 +0100
Subject: [PATCH 049/420] Removed log
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 .../views/settings/tabs/user/GeneralUserSettingsTab.js           | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
index e87dca88c8..41597604e9 100644
--- a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
@@ -405,7 +405,6 @@ export default class GeneralUserSettingsTab extends React.Component {
     render() {
         const plaf = PlatformPeg.get();
         const supportsMultiLanguageSpellCheck = plaf.supportsMultiLanguageSpellCheck();
-        console.log("LOG", supportsMultiLanguageSpellCheck);
 
         const discoWarning = this.state.requiredPolicyInfo.hasTerms
             ? <img className='mx_GeneralUserSettingsTab_warningIcon'

From 1ba512af2ad9924259c539401c238c76246adc7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Thu, 18 Feb 2021 20:12:48 +0100
Subject: [PATCH 050/420] Use getSpellCheckLanguages() instead of a setting
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 src/BasePlatform.ts                                   |  4 ++++
 .../settings/tabs/user/GeneralUserSettingsTab.js      | 11 ++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/BasePlatform.ts b/src/BasePlatform.ts
index fe655371a5..9d7077097b 100644
--- a/src/BasePlatform.ts
+++ b/src/BasePlatform.ts
@@ -250,6 +250,10 @@ export default abstract class BasePlatform {
 
     setSpellCheckLanguages(preferredLangs: string[]) {}
 
+    getSpellCheckLanguages(): Promise<string[]> | null {
+        return null;
+    }
+
     getAvailableSpellCheckLanguages(): Promise<string[]> | null {
         return null;
     }
diff --git a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
index 41597604e9..3936864215 100644
--- a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
@@ -50,7 +50,7 @@ export default class GeneralUserSettingsTab extends React.Component {
 
         this.state = {
             language: languageHandler.getCurrentLanguage(),
-            spellCheckLanguages: SettingsStore.getValue("spell-check-languages", null, false),
+            spellCheckLanguages: [],
             haveIdServer: Boolean(MatrixClientPeg.get().getIdentityServerUrl()),
             serverSupportsSeparateAddAndBind: null,
             idServerHasUnsignedTerms: false,
@@ -87,6 +87,15 @@ export default class GeneralUserSettingsTab extends React.Component {
         this._getThreepidState();
     }
 
+    async componentDidMount() {
+        const plaf = PlatformPeg.get();
+        if (plaf) {
+            this.setState({
+                spellCheckLanguages: await plaf.getSpellCheckLanguages(),
+            });
+        }
+    }
+
     componentWillUnmount() {
         dis.unregister(this.dispatcherRef);
     }

From 5a6e393fa2c6344a00efc14ab4eb17fc6a258a64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Thu, 18 Feb 2021 20:13:55 +0100
Subject: [PATCH 051/420] Removed spell-check-languages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 .../views/settings/tabs/user/GeneralUserSettingsTab.js        | 1 -
 src/settings/Settings.ts                                      | 4 ----
 2 files changed, 5 deletions(-)

diff --git a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
index 3936864215..b17ab18c39 100644
--- a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
@@ -194,7 +194,6 @@ export default class GeneralUserSettingsTab extends React.Component {
     };
 
     _onSpellCheckLanguagesChange = (languages) => {
-        SettingsStore.setValue("spell-check-languages", null, SettingLevel.DEVICE, languages);
         this.setState({spellCheckLanguages: languages});
 
         const plaf = PlatformPeg.get();
diff --git a/src/settings/Settings.ts b/src/settings/Settings.ts
index b486f0fbf8..ca5e2f1d04 100644
--- a/src/settings/Settings.ts
+++ b/src/settings/Settings.ts
@@ -424,10 +424,6 @@ export const SETTINGS: {[setting: string]: ISetting} = {
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG,
         default: "en",
     },
-    "spell-check-languages": {
-        supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG,
-        default: ["en-US"],
-    },
     "breadcrumb_rooms": {
         // not really a setting
         supportedLevels: [SettingLevel.ACCOUNT],

From ad85764a8e3d1025c76db29e9f53ba690ac2eb4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Thu, 25 Feb 2021 18:23:32 +0100
Subject: [PATCH 052/420] Fix timeline expansion
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 res/css/structures/_MainSplit.scss | 1 +
 res/css/structures/_RoomView.scss  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/res/css/structures/_MainSplit.scss b/res/css/structures/_MainSplit.scss
index f05f24d0d7..9597083e9c 100644
--- a/res/css/structures/_MainSplit.scss
+++ b/res/css/structures/_MainSplit.scss
@@ -19,6 +19,7 @@ limitations under the License.
     flex-direction: row;
     min-width: 0;
     height: 100%;
+    justify-content: space-between;
 }
 
 .mx_MainSplit > .mx_RightPanel_ResizeWrapper {
diff --git a/res/css/structures/_RoomView.scss b/res/css/structures/_RoomView.scss
index cd8c640132..5240a0650f 100644
--- a/res/css/structures/_RoomView.scss
+++ b/res/css/structures/_RoomView.scss
@@ -121,6 +121,7 @@ limitations under the License.
     position: relative; //for .mx_RoomView_auxPanel_fullHeight
     display: flex;
     flex-direction: column;
+    width: 100%;
 }
 
 .mx_RoomView_body {

From aa4ec9fca1a65202306ee77d705b15f1782de188 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Thu, 25 Feb 2021 18:27:52 +0100
Subject: [PATCH 053/420] Make $droptarget-bg-color more opaque
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 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 1c89d83c01..ea7b0472e0 100644
--- a/res/themes/light/css/_light.scss
+++ b/res/themes/light/css/_light.scss
@@ -68,7 +68,7 @@ $groupFilterPanel-bg-color: rgba(232, 232, 232, 0.77);
 $plinth-bg-color: $secondary-accent-color;
 
 // used by RoomDropTarget
-$droptarget-bg-color: rgba(255,255,255,0.5);
+$droptarget-bg-color: rgba(255,255,255,0.95);
 
 // used by AddressSelector
 $selected-color: $secondary-accent-color;

From 8551855a5626d06e6feda6f849f50b26af85a194 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Thu, 25 Feb 2021 18:30:14 +0100
Subject: [PATCH 054/420] Add $droptarget-bg-color to the dark theme
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 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 a878aa3cdd..f6f415ce70 100644
--- a/res/themes/dark/css/_dark.scss
+++ b/res/themes/dark/css/_dark.scss
@@ -42,6 +42,9 @@ $preview-bar-bg-color: $header-panel-bg-color;
 $groupFilterPanel-bg-color: rgba(38, 39, 43, 0.82);
 $inverted-bg-color: $base-color;
 
+// used by RoomDropTarget
+$droptarget-bg-color: rgba(21,25,30,0.95);
+
 // used by AddressSelector
 $selected-color: $room-highlight-color;
 

From a3001f77e46e7c3ac3479a70eb56db312c6f1361 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Thu, 25 Feb 2021 18:30:39 +0100
Subject: [PATCH 055/420] Remove rounded corners of the drop area
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 res/css/structures/_RoomView.scss | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/res/css/structures/_RoomView.scss b/res/css/structures/_RoomView.scss
index 5240a0650f..e80ac062b6 100644
--- a/res/css/structures/_RoomView.scss
+++ b/res/css/structures/_RoomView.scss
@@ -30,9 +30,6 @@ limitations under the License.
 
     pointer-events: none;
 
-    border-top-left-radius: 10px;
-    border-top-right-radius: 10px;
-
     background-color: $droptarget-bg-color;
 
     position: absolute;

From 26b70b62280b7f4fa21c6287faf20a309a399abe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Thu, 25 Feb 2021 18:32:04 +0100
Subject: [PATCH 056/420] Remove label background
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 res/css/structures/_RoomView.scss | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/res/css/structures/_RoomView.scss b/res/css/structures/_RoomView.scss
index e80ac062b6..8ba31fac20 100644
--- a/res/css/structures/_RoomView.scss
+++ b/res/css/structures/_RoomView.scss
@@ -42,11 +42,6 @@ limitations under the License.
 
 .mx_RoomView_fileDropTargetLabel {
     position: absolute;
-
-    border-radius: 10px;
-    padding: 10px;
-
-    background-color: $menu-bg-color;
 }
 
 .mx_RoomView_auxPanel {

From 6a7340e8be3844881b1c114d74687983b9c0ba20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Thu, 25 Feb 2021 18:46:48 +0100
Subject: [PATCH 057/420] Use new upload icon
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 res/img/upload-big.svg | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/res/img/upload-big.svg b/res/img/upload-big.svg
index 6099c2e976..9a6a265fdb 100644
--- a/res/img/upload-big.svg
+++ b/res/img/upload-big.svg
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="45px" height="59px" viewBox="-1 -1 45 59" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: bin/sketchtool 1.4 (305) - http://www.bohemiancoding.com/sketch -->
-    <title>icons_upload_drop</title>
-    <desc>Created with bin/sketchtool.</desc>
-    <defs></defs>
-    <g id="03-Input" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="03_05-File-drop" sketch:type="MSArtboardGroup" transform="translate(-570.000000, -368.000000)">
-            <g id="icons_upload_drop" sketch:type="MSLayerGroup" transform="translate(570.000000, 368.000000)">
-                <g id="Rectangle-5-+-Rectangle-6" sketch:type="MSShapeGroup">
-                    <path d="M0,4.00812931 C0,1.79450062 1.78537926,0 4.00241155,0 L24.8253683,0 C24.8253683,0 42.2466793,16.8210687 42.2466793,16.8210687 L42.2466793,53.000599 C42.2466793,55.2094072 40.4583762,57 38.2531894,57 L3.99348992,57 C1.78794634,57 0,55.1999609 0,52.9918707 L0,4.00812931 Z" id="Rectangle-5" stroke="#76CFA6"></path>
-                    <path d="M40.5848017,19.419576 L29.8354335,19.419576 C26.7387692,19.419576 24.2284269,16.9063989 24.2284269,13.8067771 L24.2284269,4.88501382 L40.5848017,19.419576 Z" id="Rectangle-6-Copy" fill="#FFFFFF"></path>
-                    <path d="M42.2466793,18.3870968 L29.539478,18.3870968 C26.4130381,18.3870968 23.8785579,15.8497544 23.8785579,12.7203286 L23.8785579,0" id="Rectangle-6" stroke="#76CFA6"></path>
-                </g>
-                <path d="M31.3419737,32.9284726 C31.701384,32.9284726 32.0607942,32.8000473 32.3359677,32.5414375 C32.8825707,32.0259772 32.8825707,31.1920926 32.3359677,30.6766323 L21.622922,20.6119619 C21.076319,20.0965016 20.187153,20.0982608 19.638678,20.6102026 L8.9125289,30.6607991 C8.36405391,31.1762594 8.36218198,32.0119032 8.90878504,32.5273635 C9.4553881,33.0445831 10.344554,33.0445831 10.893029,32.530882 L19.2399573,24.7092556 L19.2437012,46.487014 C19.2437012,47.2153435 19.874541,47.8064516 20.6476474,47.8064516 C21.4244976,47.8064516 22.0515936,47.2153435 22.0515936,46.487014 L22.0478497,24.7426814 L30.3498517,32.5414375 C30.6231533,32.8000473 30.9825635,32.9284726 31.3419737,32.9284726 L31.3419737,32.9284726 Z" id="Fill-75" fill="#76CFA6" sketch:type="MSShapeGroup"></path>
-            </g>
-        </g>
-    </g>
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16 0C7.16344 0 0 7.16344 0 16C0 24.8366 7.16344 32 16 32C24.8366 32 32 24.8366 32 16C32 7.16344 24.8366 0 16 0ZM17.2511 6.97409C16.9775 6.68236 16.5885 6.50012 16.157 6.50012C15.793 6.50012 15.4593 6.62973 15.1996 6.84532C15.1545 6.88267 15.1115 6.92281 15.0707 6.96564L8.79618 13.5539C8.22485 14.1538 8.24801 15.1032 8.8479 15.6746C9.4478 16.2459 10.3973 16.2227 10.9686 15.6228L14.657 11.7501V23.0589C14.657 23.8874 15.3285 24.5589 16.157 24.5589C16.9854 24.5589 17.657 23.8874 17.657 23.0589V11.7502L21.3452 15.6228C21.9165 16.2227 22.866 16.2459 23.4659 15.6746C24.0658 15.1032 24.0889 14.1538 23.5176 13.5539L17.2511 6.97409Z" fill="#0DBD8B"/>
 </svg>

From 1c48804d96c3cdda150e38e2d520a2268dd5728e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Thu, 25 Feb 2021 19:28:08 +0100
Subject: [PATCH 058/420] Remove unnecessary class
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 res/css/structures/_RoomView.scss       | 4 ----
 src/components/views/rooms/AuxPanel.tsx | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/res/css/structures/_RoomView.scss b/res/css/structures/_RoomView.scss
index 8ba31fac20..28d8d1e196 100644
--- a/res/css/structures/_RoomView.scss
+++ b/res/css/structures/_RoomView.scss
@@ -40,10 +40,6 @@ limitations under the License.
     align-items: center;
 }
 
-.mx_RoomView_fileDropTargetLabel {
-    position: absolute;
-}
-
 .mx_RoomView_auxPanel {
     min-width: 0px;
     width: 100%;
diff --git a/src/components/views/rooms/AuxPanel.tsx b/src/components/views/rooms/AuxPanel.tsx
index 7966643084..543a50d59f 100644
--- a/src/components/views/rooms/AuxPanel.tsx
+++ b/src/components/views/rooms/AuxPanel.tsx
@@ -156,7 +156,7 @@ export default class AuxPanel extends React.Component<IProps, IState> {
         if (this.props.draggingFile) {
             fileDropTarget = (
                 <div className="mx_RoomView_fileDropTarget">
-                    <div className="mx_RoomView_fileDropTargetLabel" title={_t("Drop File Here")}>
+                    <div title={_t("Drop File Here")}>
                         <TintableSvg src={require("../../../../res/img/upload-big.svg")} width="45" height="59" />
                         <br />
                         { _t("Drop file here to upload") }

From 43e1144ae7ca7eff08c1666b4a179ba828d41432 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Thu, 25 Feb 2021 19:36:55 +0100
Subject: [PATCH 059/420] Don't use TintableSVG
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This seemed to have caused a little lag and it was unnecessary

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 src/components/views/rooms/AuxPanel.tsx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/views/rooms/AuxPanel.tsx b/src/components/views/rooms/AuxPanel.tsx
index 543a50d59f..c9150d588f 100644
--- a/src/components/views/rooms/AuxPanel.tsx
+++ b/src/components/views/rooms/AuxPanel.tsx
@@ -150,14 +150,12 @@ export default class AuxPanel extends React.Component<IProps, IState> {
     }
 
     render() {
-        const TintableSvg = sdk.getComponent("elements.TintableSvg");
-
         let fileDropTarget = null;
         if (this.props.draggingFile) {
             fileDropTarget = (
                 <div className="mx_RoomView_fileDropTarget">
                     <div title={_t("Drop File Here")}>
-                        <TintableSvg src={require("../../../../res/img/upload-big.svg")} width="45" height="59" />
+                        <img src={require( "../../../../res/img/upload-big.svg")}> </img>
                         <br />
                         { _t("Drop file here to upload") }
                     </div>

From 7277c285a9326928555e05766ee3ce33603de18d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Thu, 25 Feb 2021 20:10:38 +0100
Subject: [PATCH 060/420] Fix weird crash
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 src/components/views/rooms/AuxPanel.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/rooms/AuxPanel.tsx b/src/components/views/rooms/AuxPanel.tsx
index c9150d588f..cc3408476c 100644
--- a/src/components/views/rooms/AuxPanel.tsx
+++ b/src/components/views/rooms/AuxPanel.tsx
@@ -155,7 +155,7 @@ export default class AuxPanel extends React.Component<IProps, IState> {
             fileDropTarget = (
                 <div className="mx_RoomView_fileDropTarget">
                     <div title={_t("Drop File Here")}>
-                        <img src={require( "../../../../res/img/upload-big.svg")}> </img>
+                        <img src={require( "../../../../res/img/upload-big.svg")} />
                         <br />
                         { _t("Drop file here to upload") }
                     </div>

From 49ea9a4788243346b20fcf5b4b79f46a7c3a80ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Thu, 25 Feb 2021 20:10:58 +0100
Subject: [PATCH 061/420] Remove sdk import
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 src/components/views/rooms/AuxPanel.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/views/rooms/AuxPanel.tsx b/src/components/views/rooms/AuxPanel.tsx
index cc3408476c..59ea8e237a 100644
--- a/src/components/views/rooms/AuxPanel.tsx
+++ b/src/components/views/rooms/AuxPanel.tsx
@@ -17,7 +17,6 @@ limitations under the License.
 import React from 'react';
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import { Room } from 'matrix-js-sdk/src/models/room'
-import * as sdk from '../../../index';
 import dis from "../../../dispatcher/dispatcher";
 import * as ObjectUtils from '../../../ObjectUtils';
 import AppsDrawer from './AppsDrawer';

From 563620484df6fa79f666ef72f414838cf0e342f1 Mon Sep 17 00:00:00 2001
From: Robin Townsend <robin@robin.town>
Date: Thu, 25 Feb 2021 14:39:20 -0500
Subject: [PATCH 062/420] Support replying with a message command

Signed-off-by: Robin Townsend <robin@robin.town>
---
 src/SlashCommands.tsx                         | 28 +++++++-----
 .../views/rooms/SendMessageComposer.js        | 44 +++++++++++++------
 2 files changed, 47 insertions(+), 25 deletions(-)

diff --git a/src/SlashCommands.tsx b/src/SlashCommands.tsx
index 6b5f261374..06468c135e 100644
--- a/src/SlashCommands.tsx
+++ b/src/SlashCommands.tsx
@@ -20,6 +20,7 @@ limitations under the License.
 
 import * as React from 'react';
 
+import { ContentHelpers } from 'matrix-js-sdk';
 import {MatrixClientPeg} from './MatrixClientPeg';
 import dis from './dispatcher/dispatcher';
 import * as sdk from './index';
@@ -126,10 +127,10 @@ export class Command {
         return this.getCommand() + " " + this.args;
     }
 
-    run(roomId: string, args: string, cmd: string) {
+    run(roomId: string, args: string) {
         // if it has no runFn then its an ignored/nop command (autocomplete only) e.g `/me`
         if (!this.runFn) return reject(_t("Command error"));
-        return this.runFn.bind(this)(roomId, args, cmd);
+        return this.runFn.bind(this)(roomId, args);
     }
 
     getUsage() {
@@ -163,7 +164,7 @@ export const Commands = [
             if (args) {
                 message = message + ' ' + args;
             }
-            return success(MatrixClientPeg.get().sendTextMessage(roomId, message));
+            return success(ContentHelpers.makeTextMessage(message));
         },
         category: CommandCategories.messages,
     }),
@@ -176,7 +177,7 @@ export const Commands = [
             if (args) {
                 message = message + ' ' + args;
             }
-            return success(MatrixClientPeg.get().sendTextMessage(roomId, message));
+            return success(ContentHelpers.makeTextMessage(message));
         },
         category: CommandCategories.messages,
     }),
@@ -189,7 +190,7 @@ export const Commands = [
             if (args) {
                 message = message + ' ' + args;
             }
-            return success(MatrixClientPeg.get().sendTextMessage(roomId, message));
+            return success(ContentHelpers.makeTextMessage(message));
         },
         category: CommandCategories.messages,
     }),
@@ -202,7 +203,7 @@ export const Commands = [
             if (args) {
                 message = message + ' ' + args;
             }
-            return success(MatrixClientPeg.get().sendTextMessage(roomId, message));
+            return success(ContentHelpers.makeTextMessage(message));
         },
         category: CommandCategories.messages,
     }),
@@ -211,7 +212,7 @@ export const Commands = [
         args: '<message>',
         description: _td('Sends a message as plain text, without interpreting it as markdown'),
         runFn: function(roomId, messages) {
-            return success(MatrixClientPeg.get().sendTextMessage(roomId, messages));
+            return success(ContentHelpers.makeTextMessage(messages));
         },
         category: CommandCategories.messages,
     }),
@@ -220,7 +221,7 @@ export const Commands = [
         args: '<message>',
         description: _td('Sends a message as html, without interpreting it as markdown'),
         runFn: function(roomId, messages) {
-            return success(MatrixClientPeg.get().sendHtmlMessage(roomId, messages, messages));
+            return success(ContentHelpers.makeHtmlMessage(messages, messages));
         },
         category: CommandCategories.messages,
     }),
@@ -966,7 +967,7 @@ export const Commands = [
         args: '<message>',
         runFn: function(roomId, args) {
             if (!args) return reject(this.getUserId());
-            return success(MatrixClientPeg.get().sendHtmlMessage(roomId, args, textToHtmlRainbow(args)));
+            return success(ContentHelpers.makeHtmlMessage(args, textToHtmlRainbow(args)));
         },
         category: CommandCategories.messages,
     }),
@@ -976,7 +977,7 @@ export const Commands = [
         args: '<message>',
         runFn: function(roomId, args) {
             if (!args) return reject(this.getUserId());
-            return success(MatrixClientPeg.get().sendHtmlEmote(roomId, args, textToHtmlRainbow(args)));
+            return success(ContentHelpers.makeHtmlEmote(args, textToHtmlRainbow(args)));
         },
         category: CommandCategories.messages,
     }),
@@ -1201,10 +1202,13 @@ export function parseCommandString(input: string) {
  * 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: string, input: string) {
+export function getCommand(input: string) {
     const {cmd, args} = parseCommandString(input);
 
     if (CommandMap.has(cmd) && CommandMap.get(cmd).isEnabled()) {
-        return () => CommandMap.get(cmd).run(roomId, args, cmd);
+        return {
+            cmd: CommandMap.get(cmd),
+            args,
+        };
     }
 }
diff --git a/src/components/views/rooms/SendMessageComposer.js b/src/components/views/rooms/SendMessageComposer.js
index 62c474e417..d1482c0df6 100644
--- a/src/components/views/rooms/SendMessageComposer.js
+++ b/src/components/views/rooms/SendMessageComposer.js
@@ -33,7 +33,7 @@ import ReplyThread from "../elements/ReplyThread";
 import {parseEvent} from '../../../editor/deserialize';
 import {findEditableEvent} from '../../../utils/EventUtils';
 import SendHistoryManager from "../../../SendHistoryManager";
-import {getCommand} from '../../../SlashCommands';
+import {CommandCategories, getCommand} from '../../../SlashCommands';
 import * as sdk from '../../../index';
 import Modal from '../../../Modal';
 import {_t, _td} from '../../../languageHandler';
@@ -287,15 +287,22 @@ export default class SendMessageComposer extends React.Component {
             }
             return text + part.text;
         }, "");
-        return [getCommand(this.props.room.roomId, commandText), commandText];
+        const {cmd, args} = getCommand(commandText);
+        return [cmd, args, commandText];
     }
 
-    async _runSlashCommand(fn) {
-        const cmd = fn();
-        let error = cmd.error;
-        if (cmd.promise) {
+    async _runSlashCommand(cmd, args) {
+        const result = cmd.run(this.props.room.roomId, args);
+        let messageContent;
+        let error = result.error;
+        if (result.promise) {
             try {
-                await cmd.promise;
+                if (cmd.category === CommandCategories.messages) {
+                    // The command returns a modified message that we need to pass on
+                    messageContent = await result.promise;
+                } else {
+                    await result.promise;
+                }
             } catch (err) {
                 error = err;
             }
@@ -304,7 +311,7 @@ export default class SendMessageComposer extends React.Component {
             console.error("Command failure: %s", error);
             const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             // assume the error is a server error when the command is async
-            const isServerError = !!cmd.promise;
+            const isServerError = !!result.promise;
             const title = isServerError ? _td("Server error") : _td("Command error");
 
             let errText;
@@ -322,6 +329,7 @@ export default class SendMessageComposer extends React.Component {
             });
         } else {
             console.log("Command success.");
+            if (messageContent) return messageContent;
         }
     }
 
@@ -330,13 +338,22 @@ export default class SendMessageComposer extends React.Component {
             return;
         }
 
+        const replyToEvent = this.props.replyToEvent;
         let shouldSend = true;
+        let content;
 
         if (!containsEmote(this.model) && this._isSlashCommand()) {
-            const [cmd, commandText] = this._getSlashCommand();
+            const [cmd, args, commandText] = this._getSlashCommand();
             if (cmd) {
-                shouldSend = false;
-                this._runSlashCommand(cmd);
+                if (cmd.category === CommandCategories.messages) {
+                    content = await this._runSlashCommand(cmd, args);
+                    if (replyToEvent) {
+                        addReplyToMessageContent(content, replyToEvent, this.props.permalinkCreator);
+                    }
+                } else {
+                    this._runSlashCommand(cmd, args);
+                    shouldSend = false;
+                }
             } else {
                 // ask the user if their unknown command should be sent as a message
                 const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
@@ -371,11 +388,12 @@ export default class SendMessageComposer extends React.Component {
             this._sendQuickReaction();
         }
 
-        const replyToEvent = this.props.replyToEvent;
         if (shouldSend) {
             const startTime = CountlyAnalytics.getTimestamp();
             const {roomId} = this.props.room;
-            const content = createMessageContent(this.model, this.props.permalinkCreator, replyToEvent);
+            if (!content) {
+                content = createMessageContent(this.model, this.props.permalinkCreator, replyToEvent);
+            }
             // don't bother sending an empty message
             if (!content.body.trim()) return;
 

From 1a7f9091b4fc41eac6d5cc1b71d1dbe61f5d7f0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Fri, 26 Feb 2021 07:51:03 +0100
Subject: [PATCH 063/420] Animate icon size
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 res/css/structures/_RoomView.scss       | 12 ++++++++++++
 src/components/views/rooms/AuxPanel.tsx | 10 +++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/res/css/structures/_RoomView.scss b/res/css/structures/_RoomView.scss
index 28d8d1e196..d5caee5e8b 100644
--- a/res/css/structures/_RoomView.scss
+++ b/res/css/structures/_RoomView.scss
@@ -36,10 +36,22 @@ limitations under the License.
     z-index: 3000;
 
     display: flex;
+    flex-direction: column;
     justify-content: center;
     align-items: center;
 }
 
+@keyframes mx_RoomView_fileDropTarget_image_animation {
+  from {width: 0px;}
+  to {width: 32px;}
+}
+
+.mx_RoomView_fileDropTarget_image {
+    animation: mx_RoomView_fileDropTarget_image_animation;
+    animation-duration: 0.5s;
+    margin-bottom: 16px;
+}
+
 .mx_RoomView_auxPanel {
     min-width: 0px;
     width: 100%;
diff --git a/src/components/views/rooms/AuxPanel.tsx b/src/components/views/rooms/AuxPanel.tsx
index 59ea8e237a..b3ef8c3cc8 100644
--- a/src/components/views/rooms/AuxPanel.tsx
+++ b/src/components/views/rooms/AuxPanel.tsx
@@ -153,11 +153,11 @@ export default class AuxPanel extends React.Component<IProps, IState> {
         if (this.props.draggingFile) {
             fileDropTarget = (
                 <div className="mx_RoomView_fileDropTarget">
-                    <div title={_t("Drop File Here")}>
-                        <img src={require( "../../../../res/img/upload-big.svg")} />
-                        <br />
-                        { _t("Drop file here to upload") }
-                    </div>
+                    <img
+                        src={require( "../../../../res/img/upload-big.svg")}
+                        className="mx_RoomView_fileDropTarget_image"
+                    />
+                    { _t("Drop file here to upload") }
                 </div>
             );
         }

From f0c26846c75559e5be013eb25ebe5f54b4f6e264 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Fri, 26 Feb 2021 08:11:58 +0100
Subject: [PATCH 064/420] Fix formatting
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 res/css/structures/_RoomView.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/css/structures/_RoomView.scss b/res/css/structures/_RoomView.scss
index d5caee5e8b..2c3fb2b32b 100644
--- a/res/css/structures/_RoomView.scss
+++ b/res/css/structures/_RoomView.scss
@@ -42,8 +42,8 @@ limitations under the License.
 }
 
 @keyframes mx_RoomView_fileDropTarget_image_animation {
-  from {width: 0px;}
-  to {width: 32px;}
+    from {width: 0px;}
+    to {width: 32px;}
 }
 
 .mx_RoomView_fileDropTarget_image {

From 172cc01f7d3dcba08235a621cff118efe3e76d83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Fri, 26 Feb 2021 08:12:10 +0100
Subject: [PATCH 065/420] Add background animation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 res/css/structures/_RoomView.scss | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/res/css/structures/_RoomView.scss b/res/css/structures/_RoomView.scss
index 2c3fb2b32b..5870e107c6 100644
--- a/res/css/structures/_RoomView.scss
+++ b/res/css/structures/_RoomView.scss
@@ -20,6 +20,12 @@ limitations under the License.
     flex-direction: column;
 }
 
+
+@keyframes mx_RoomView_fileDropTarget_animation {
+    from {opacity: 0;}
+    to {opacity: 0.95;}
+}
+
 .mx_RoomView_fileDropTarget {
     min-width: 0px;
     width: 100%;
@@ -30,7 +36,8 @@ limitations under the License.
 
     pointer-events: none;
 
-    background-color: $droptarget-bg-color;
+    background-color: $primary-bg-color;
+    opacity: 0.95;
 
     position: absolute;
     z-index: 3000;
@@ -39,6 +46,9 @@ limitations under the License.
     flex-direction: column;
     justify-content: center;
     align-items: center;
+
+    animation: mx_RoomView_fileDropTarget_animation;
+    animation-duration: 0.5s;
 }
 
 @keyframes mx_RoomView_fileDropTarget_image_animation {

From 3e0558f4d97bc618cc8e6d71f411370e894d642f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Fri, 26 Feb 2021 08:12:38 +0100
Subject: [PATCH 066/420] Remove droptarget colors
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 res/themes/dark/css/_dark.scss   | 3 ---
 res/themes/light/css/_light.scss | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss
index f6f415ce70..a878aa3cdd 100644
--- a/res/themes/dark/css/_dark.scss
+++ b/res/themes/dark/css/_dark.scss
@@ -42,9 +42,6 @@ $preview-bar-bg-color: $header-panel-bg-color;
 $groupFilterPanel-bg-color: rgba(38, 39, 43, 0.82);
 $inverted-bg-color: $base-color;
 
-// used by RoomDropTarget
-$droptarget-bg-color: rgba(21,25,30,0.95);
-
 // used by AddressSelector
 $selected-color: $room-highlight-color;
 
diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss
index ea7b0472e0..c92e491ca2 100644
--- a/res/themes/light/css/_light.scss
+++ b/res/themes/light/css/_light.scss
@@ -67,9 +67,6 @@ $groupFilterPanel-bg-color: rgba(232, 232, 232, 0.77);
 // used by RoomDirectory permissions
 $plinth-bg-color: $secondary-accent-color;
 
-// used by RoomDropTarget
-$droptarget-bg-color: rgba(255,255,255,0.95);
-
 // used by AddressSelector
 $selected-color: $secondary-accent-color;
 

From 49ea83edb93dfa0e6f572aeac002adaaa0370fc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Fri, 26 Feb 2021 08:14:27 +0100
Subject: [PATCH 067/420] i18n
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 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 5bbbdf60b5..9af8ccc172 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1381,7 +1381,6 @@
     "Remove %(phone)s?": "Remove %(phone)s?",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.",
     "Phone Number": "Phone Number",
-    "Drop File Here": "Drop File Here",
     "Drop file here to upload": "Drop file here to upload",
     "This user has not verified all of their sessions.": "This user has not verified all of their sessions.",
     "You have not verified this user.": "You have not verified this user.",

From e90ae2ea7596bff850cf4014c1109f93234132b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Fri, 26 Feb 2021 08:18:05 +0100
Subject: [PATCH 068/420] Delint
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 res/css/structures/_RoomView.scss | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/res/css/structures/_RoomView.scss b/res/css/structures/_RoomView.scss
index 5870e107c6..5e8d84ff32 100644
--- a/res/css/structures/_RoomView.scss
+++ b/res/css/structures/_RoomView.scss
@@ -22,8 +22,12 @@ limitations under the License.
 
 
 @keyframes mx_RoomView_fileDropTarget_animation {
-    from {opacity: 0;}
-    to {opacity: 0.95;}
+    from {
+        opacity: 0;
+    }
+    to {
+        opacity: 0.95;
+    }
 }
 
 .mx_RoomView_fileDropTarget {
@@ -52,8 +56,12 @@ limitations under the License.
 }
 
 @keyframes mx_RoomView_fileDropTarget_image_animation {
-    from {width: 0px;}
-    to {width: 32px;}
+    from {
+        width: 0px;
+    }
+    to {
+        width: 32px;
+    }
 }
 
 .mx_RoomView_fileDropTarget_image {

From 819a0b013fda927bea3197e458741f4f4f85a271 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Fri, 26 Feb 2021 11:08:31 +0100
Subject: [PATCH 069/420] min-width
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We need to allow the container to be smaller

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 res/css/structures/_RoomView.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/res/css/structures/_RoomView.scss b/res/css/structures/_RoomView.scss
index 5e8d84ff32..28591ad7a4 100644
--- a/res/css/structures/_RoomView.scss
+++ b/res/css/structures/_RoomView.scss
@@ -140,6 +140,7 @@ limitations under the License.
     display: flex;
     flex-direction: column;
     width: 100%;
+    min-width: 0;
 }
 
 .mx_RoomView_body {

From 0d6a9fce67d24f441a62e140a2a73f669b959cbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Fri, 26 Feb 2021 11:12:14 +0100
Subject: [PATCH 070/420] Remove weird styling
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 src/components/structures/RoomView.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/structures/RoomView.tsx b/src/components/structures/RoomView.tsx
index ff09af454e..42eafe5bdc 100644
--- a/src/components/structures/RoomView.tsx
+++ b/src/components/structures/RoomView.tsx
@@ -2058,7 +2058,7 @@ export default class RoomView extends React.Component<IProps, IState> {
                             appsShown={this.state.showApps}
                         />
                         <MainSplit panel={rightPanel} resizeNotifier={this.props.resizeNotifier}>
-                            <div className={"mx_RoomView_container"}>
+                            <div className="mx_RoomView_container">
                                 {auxPanel}
                                 <div className="mx_RoomView_body">
                                     <div className={timelineClasses}>

From 11c5aa02d290739fff31bfa8365fe76562032594 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Fri, 26 Feb 2021 11:19:45 +0100
Subject: [PATCH 071/420] Remove mx_RoomView_container
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 res/css/structures/_MainSplit.scss     |  1 +
 res/css/structures/_RoomView.scss      |  8 -------
 src/components/structures/RoomView.tsx | 30 ++++++++++++--------------
 3 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/res/css/structures/_MainSplit.scss b/res/css/structures/_MainSplit.scss
index 9597083e9c..5fa62e921d 100644
--- a/res/css/structures/_MainSplit.scss
+++ b/res/css/structures/_MainSplit.scss
@@ -20,6 +20,7 @@ limitations under the License.
     min-width: 0;
     height: 100%;
     justify-content: space-between;
+    min-height: 0;
 }
 
 .mx_MainSplit > .mx_RightPanel_ResizeWrapper {
diff --git a/res/css/structures/_RoomView.scss b/res/css/structures/_RoomView.scss
index 28591ad7a4..b3dab5f992 100644
--- a/res/css/structures/_RoomView.scss
+++ b/res/css/structures/_RoomView.scss
@@ -135,14 +135,6 @@ limitations under the License.
     height: 50px;
 }
 
-.mx_RoomView_container {
-    position: relative; //for .mx_RoomView_auxPanel_fullHeight
-    display: flex;
-    flex-direction: column;
-    width: 100%;
-    min-width: 0;
-}
-
 .mx_RoomView_body {
     display: flex;
     flex-direction: column;
diff --git a/src/components/structures/RoomView.tsx b/src/components/structures/RoomView.tsx
index 42eafe5bdc..be2f81a176 100644
--- a/src/components/structures/RoomView.tsx
+++ b/src/components/structures/RoomView.tsx
@@ -2058,24 +2058,22 @@ export default class RoomView extends React.Component<IProps, IState> {
                             appsShown={this.state.showApps}
                         />
                         <MainSplit panel={rightPanel} resizeNotifier={this.props.resizeNotifier}>
-                            <div className="mx_RoomView_container">
+                            <div className="mx_RoomView_body">
                                 {auxPanel}
-                                <div className="mx_RoomView_body">
-                                    <div className={timelineClasses}>
-                                        {topUnreadMessagesBar}
-                                        {jumpToBottom}
-                                        {messagePanel}
-                                        {searchResultsPanel}
-                                    </div>
-                                    <div className={statusBarAreaClass}>
-                                        <div className="mx_RoomView_statusAreaBox">
-                                            <div className="mx_RoomView_statusAreaBox_line" />
-                                            {statusBar}
-                                        </div>
-                                    </div>
-                                    {previewBar}
-                                    {messageComposer}
+                                <div className={timelineClasses}>
+                                    {topUnreadMessagesBar}
+                                    {jumpToBottom}
+                                    {messagePanel}
+                                    {searchResultsPanel}
                                 </div>
+                                <div className={statusBarAreaClass}>
+                                    <div className="mx_RoomView_statusAreaBox">
+                                        <div className="mx_RoomView_statusAreaBox_line" />
+                                        {statusBar}
+                                    </div>
+                                </div>
+                                {previewBar}
+                                {messageComposer}
                             </div>
                         </MainSplit>
                     </ErrorBoundary>

From 9a5ba072ba0f551dc618cdf8bfb7afba004d01fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Fri, 26 Feb 2021 11:23:58 +0100
Subject: [PATCH 072/420] Fix auxPanel
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 src/components/structures/RoomView.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/structures/RoomView.tsx b/src/components/structures/RoomView.tsx
index be2f81a176..5b79f23e0b 100644
--- a/src/components/structures/RoomView.tsx
+++ b/src/components/structures/RoomView.tsx
@@ -2059,8 +2059,8 @@ export default class RoomView extends React.Component<IProps, IState> {
                         />
                         <MainSplit panel={rightPanel} resizeNotifier={this.props.resizeNotifier}>
                             <div className="mx_RoomView_body">
-                                {auxPanel}
                                 <div className={timelineClasses}>
+                                    {auxPanel}
                                     {topUnreadMessagesBar}
                                     {jumpToBottom}
                                     {messagePanel}

From 3bed37463fea1ff1a7c86ef5fe9a0a123e06008f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Fri, 26 Feb 2021 11:38:05 +0100
Subject: [PATCH 073/420] Remove unnecessary code
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 res/css/structures/_MainSplit.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/res/css/structures/_MainSplit.scss b/res/css/structures/_MainSplit.scss
index 5fa62e921d..2d9ea2729c 100644
--- a/res/css/structures/_MainSplit.scss
+++ b/res/css/structures/_MainSplit.scss
@@ -19,7 +19,6 @@ limitations under the License.
     flex-direction: row;
     min-width: 0;
     height: 100%;
-    justify-content: space-between;
     min-height: 0;
 }
 

From 3a643e5b9df189916d2a3b8162636e2d05a5e2d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Fri, 26 Feb 2021 11:46:54 +0100
Subject: [PATCH 074/420] Remove unnecessary changes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 res/css/structures/_MainSplit.scss | 34 ++++++++++++------------------
 res/css/structures/_RoomView.scss  |  2 --
 2 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/res/css/structures/_MainSplit.scss b/res/css/structures/_MainSplit.scss
index 2d9ea2729c..8199121420 100644
--- a/res/css/structures/_MainSplit.scss
+++ b/res/css/structures/_MainSplit.scss
@@ -18,35 +18,27 @@ limitations under the License.
     display: flex;
     flex-direction: row;
     min-width: 0;
-    height: 100%;
     min-height: 0;
+    height: 100%;
 }
 
 .mx_MainSplit > .mx_RightPanel_ResizeWrapper {
-    padding: 0 5px 5px 0px;
+    padding: 5px;
+    // margin left to not allow the handle to not encroach on the space for the scrollbar
+    margin-left: 8px;
     height: calc(100vh - 51px); // height of .mx_RoomHeader.light-panel
 
-    .mx_RightPanel_ResizeHandle {
-        width: 9px;
-    }
-
     &:hover .mx_RightPanel_ResizeHandle {
-        &::before {
-            position: absolute;
-            left: 6px;
-            top: 50%;
-            transform: translate(0, -50%);
+        // Need to use important to override element style attributes
+        // set by re-resizable
+        top: 50% !important;
+        transform: translate(0, -50%);
 
-            height: 64px;
-            width: 4px;
-            border-radius: 4px;
+        height: 64px !important; // to match width of the ones on roomlist
+        width: 4px !important;
+        border-radius: 4px !important;
 
-            content: ' ';
-
-            background-color: $primary-fg-color;
-            opacity: 0.8;
-
-            margin-left: -10px;
-        }
+        background-color: $primary-fg-color;
+        opacity: 0.8;
     }
 }
diff --git a/res/css/structures/_RoomView.scss b/res/css/structures/_RoomView.scss
index b3dab5f992..26382b55e8 100644
--- a/res/css/structures/_RoomView.scss
+++ b/res/css/structures/_RoomView.scss
@@ -144,8 +144,6 @@ limitations under the License.
     .mx_RoomView_messagePanel, .mx_RoomView_messagePanelSpinner, .mx_RoomView_messagePanelSearchSpinner {
         order: 2;
     }
-
-    margin-right: 10px;
 }
 
 .mx_RoomView_body .mx_RoomView_timeline {

From a0200de7b4a0afdecfdf5f0e06a68e0d990876f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Fri, 26 Feb 2021 18:34:54 +0100
Subject: [PATCH 075/420] Add scrollToBottomOnMessageSent setting
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 src/settings/Settings.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/settings/Settings.ts b/src/settings/Settings.ts
index ca5e2f1d04..dd431f9b75 100644
--- a/src/settings/Settings.ts
+++ b/src/settings/Settings.ts
@@ -317,6 +317,11 @@ export const SETTINGS: {[setting: string]: ISetting} = {
         displayName: _td('Show line numbers in code blocks'),
         default: true,
     },
+    "scrollToBottomOnMessageSent": {
+        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
+        displayName: _td('Jump to the bottom of the timeline when you send a message'),
+        default: true,
+    },
     "Pill.shouldShowPillAvatar": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         displayName: _td('Show avatars in user and room mentions'),

From 1387c9f94db2815184f920c516a40b2809916fcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Fri, 26 Feb 2021 18:35:19 +0100
Subject: [PATCH 076/420] Display scrollToBottomOnMessageSent
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 .../views/settings/tabs/user/PreferencesUserSettingsTab.js       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
index 04fcea39dc..5e1c2e7288 100644
--- a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
@@ -48,6 +48,7 @@ export default class PreferencesUserSettingsTab extends React.Component {
         'showRedactions',
         'enableSyntaxHighlightLanguageDetection',
         'expandCodeByDefault',
+        `scrollToBottomOnMessageSent`,
         'showCodeLineNumbers',
         'showJoinLeaves',
         'showAvatarChanges',

From 361420bf6826dc309f6f46c4f9b4d0bed4790982 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Fri, 26 Feb 2021 18:35:45 +0100
Subject: [PATCH 077/420] Use scrollToBottomOnMessageSent
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 src/components/views/rooms/SendMessageComposer.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/views/rooms/SendMessageComposer.js b/src/components/views/rooms/SendMessageComposer.js
index 62c474e417..c2baa2762c 100644
--- a/src/components/views/rooms/SendMessageComposer.js
+++ b/src/components/views/rooms/SendMessageComposer.js
@@ -403,7 +403,9 @@ export default class SendMessageComposer extends React.Component {
         this._editorRef.clearUndoHistory();
         this._editorRef.focus();
         this._clearStoredEditorState();
-        dis.dispatch({action: "scroll_to_bottom"});
+        if (SettingsStore.getValue("scrollToBottomOnMessageSent")) {
+            dis.dispatch({action: "scroll_to_bottom"});
+        }
     }
 
     componentWillUnmount() {

From 83df645dbbadcab2a003e14f946f11cf4daa59e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Fri, 26 Feb 2021 18:35:53 +0100
Subject: [PATCH 078/420] i18n
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@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 5bbbdf60b5..4bd7131bfe 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -808,6 +808,7 @@
     "Enable automatic language detection for syntax highlighting": "Enable automatic language detection for syntax highlighting",
     "Expand code blocks by default": "Expand code blocks by default",
     "Show line numbers in code blocks": "Show line numbers in code blocks",
+    "Jump to the bottom of the timeline when you send a message": "Jump to the bottom of the timeline when you send a message",
     "Show avatars in user and room mentions": "Show avatars in user and room mentions",
     "Enable big emoji in chat": "Enable big emoji in chat",
     "Send typing notifications": "Send typing notifications",

From 414f18b19f1c33d4cfaff8fa0440130b76d86dcf Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Fri, 26 Feb 2021 18:01:24 +0000
Subject: [PATCH 079/420] Translated using Weblate (German)

Currently translated at 99.2% (2759 of 2780 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
---
 src/i18n/strings/de_DE.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 3f657e105b..269fef0da1 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -16,7 +16,7 @@
     "Deops user with given id": "Setzt das Berechtigungslevel des/der Benutzer:in mit der angegebenen ID zurück",
     "Invites user with given id to current room": "Lädt den/die Benutzer:in mit der angegebenen ID in den aktuellen Raum ein",
     "Kicks user with given id": "Benutzer:in mit der angegebenen ID kicken",
-    "Changes your display nickname": "Ändert deinen angezeigten Nicknamen",
+    "Changes your display nickname": "Ändert deinen Anzeigenamen",
     "Change Password": "Passwort ändern",
     "Searches DuckDuckGo for results": "Verwendet DuckDuckGo für Suchergebnisse",
     "Commands": "Kommandos",
@@ -115,7 +115,7 @@
     "You are already in a call.": "Du bist bereits in einem Gespräch.",
     "You cannot place a call with yourself.": "Du kannst keinen Anruf mit dir selbst starten.",
     "You cannot place VoIP calls in this browser.": "VoIP-Gespräche werden von diesem Browser nicht unterstützt.",
-    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Deine E-Mail-Adresse scheint nicht mit einer Matrix-ID auf diesem Home-Server verbunden zu sein.",
+    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Deine E-Mail-Adresse scheint nicht mit einer Matrix-ID auf diesem Homeserver verbunden zu sein.",
     "Sun": "So",
     "Mon": "Mo",
     "Tue": "Di",
@@ -636,7 +636,7 @@
     "Which officially provided instance you are using, if any": "Welche offiziell angebotene Instanz du nutzt, wenn überhaupt eine",
     "<a>In reply to</a> <pill>": "<a>Als Antwort auf</a> <pill>",
     "This room is not public. You will not be able to rejoin without an invite.": "Dies ist kein öffentlicher Raum. Du wirst diesen nicht ohne Einladung wieder beitreten können.",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s änderte den Anzeigenamen auf %(displayName)s.",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s hat den Anzeigenamen zu %(displayName)s geändert.",
     "Failed to set direct chat tag": "Fehler beim Setzen der Direkt-Chat-Markierung",
     "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",
@@ -834,7 +834,7 @@
     "This event could not be displayed": "Dieses Ereignis konnte nicht angezeigt werden",
     "A call is currently being placed!": "Ein Anruf wurde schon gestartet!",
     "Permission Required": "Berechtigung benötigt",
-    "You do not have permission to start a conference call in this room": "Du hast keine Berechtigung um ein Konferenzgespräch in diesem Raum zu starten",
+    "You do not have permission to start a conference call in this room": "Du hast keine Berechtigung ein Konferenzgespräch in diesem Raum zu starten",
     "Failed to remove widget": "Widget konnte nicht entfernt werden",
     "An error ocurred whilst trying to remove the widget from the room": "Ein Fehler trat auf während versucht wurde, das Widget aus diesem Raum zu entfernen",
     "System Alerts": "System-Benachrichtigung",
@@ -2944,8 +2944,8 @@
     "Homeserver": "Heimserver",
     "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Element with an existing Matrix account on a different homeserver.": "Du kannst in den benutzerdefinierten Serveroptionen eine andere Heimserver-URL angeben, um dich bei anderen Matrixservern anzumelden.",
     "Server Options": "Servereinstellungen",
-    "No other application is using the webcam": "Keine andere Anwendung auf die Webcam zugreift",
-    "Permission is granted to use the webcam": "Auf die Webcam zugegriffen werden darf",
+    "No other application is using the webcam": "keine andere Anwendung auf die Webcam zugreift",
+    "Permission is granted to use the webcam": "auf die Webcam zugegriffen werden darf",
     "A microphone and webcam are plugged in and set up correctly": "Mikrofon und Webcam eingesteckt und richtig eingerichtet sind",
     "Call failed because no microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "Der Anruf ist fehlgeschlagen weil nicht auf das Mikrofon zugegriffen werden konnte. Stelle sicher, dass das Mikrofon richtig eingesteckt und eingerichtet ist.",
     "Call failed because no webcam or microphone could not be accessed. Check that:": "Der Anruf ist fehlgeschlagen weil nicht auf das Mikrofon oder die Webcam zugegriffen werden konnte. Stelle sicher, dass:",

From d83b935fc0f80bf9460b94254a54eb2cf0e52a63 Mon Sep 17 00:00:00 2001
From: libexus <Asterixeins324@gmail.com>
Date: Thu, 25 Feb 2021 07:30:54 +0000
Subject: [PATCH 080/420] Translated using Weblate (German)

Currently translated at 99.2% (2759 of 2780 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
---
 src/i18n/strings/de_DE.json | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 269fef0da1..ff754e7d7e 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -181,7 +181,7 @@
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s hat die Verbannung von %(targetName)s aufgehoben.",
     "Usage": "Verwendung",
     "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s hat die Einladung für %(targetName)s zurückgezogen.",
-    "You need to be able to invite users to do that.": "Du brauchst die Berechtigung Benutzer:innen einzuladen haben, um diese Aktion ausführen zu können.",
+    "You need to be able to invite users to do that.": "Du musst die Berechtigung \"Benutzer:innen einladen\" haben, um diese Aktion ausführen zu können.",
     "You need to be logged in.": "Du musst angemeldet sein.",
     "There are no visible files in this room": "Es gibt keine sichtbaren Dateien in diesem Raum",
     "Connectivity to the server has been lost.": "Verbindung zum Server wurde unterbrochen.",
@@ -1636,7 +1636,7 @@
     "Use Single Sign On to continue": "Single-Sign-On zum Fortfahren nutzen",
     "Confirm adding this email address by using Single Sign On to prove your identity.": "Bestätige die hinzugefügte E-Mail-Adresse mit Single Sign-On, um deine Identität nachzuweisen.",
     "Single Sign On": "Single Sign-On",
-    "Confirm adding email": "Bestätige hinzugefügte E-Mail-Addresse",
+    "Confirm adding email": "Hinzugefügte E-Mail-Addresse bestätigen",
     "Confirm adding this phone number by using Single Sign On to prove your identity.": "Bestätige die hinzugefügte Telefonnummer, indem du deine Identität mittels Single Sign-On nachweist.",
     "Click the button below to confirm adding this phone number.": "Klicke unten die Schaltfläche, um die hinzugefügte Telefonnummer zu bestätigen.",
     "If you cancel now, you won't complete your operation.": "Wenn du jetzt abbrichst, wirst du deinen Vorgang nicht fertigstellen.",
@@ -3059,5 +3059,16 @@
     "Cookie Policy": "Cookie-Richtlinie",
     "Learn more in our <privacyPolicyLink />, <termsOfServiceLink /> and <cookiePolicyLink />.": "Erfahren mehr in unserer <privacyPolicyLink />, <termsOfServiceLink /> und <cookiePolicyLink />.",
     "Failed to connect to your homeserver. Please close this dialog and try again.": "Verbindung zum Homeserver fehlgeschlagen. Bitte schließe diesen Dialog and versuche es erneut.",
-    "Abort": "Abbrechen"
+    "Abort": "Abbrechen",
+    "Upgrade to %(hostSignupBrand)s": "Zu %(hostSignupBrand)s upgraden",
+    "Edit Values": "Werte bearbeiten",
+    "Value in this room:": "Wert in diesem Raum:",
+    "Value:": "Wert:",
+    "Level": "Level",
+    "This UI does NOT check the types of the values. Use at your own risk.": "Diese Benutzeroberfläche prüft nicht auf richtige Datentypen. Benutzung auf eigene Gefahr.",
+    "Setting:": "Einstellung:",
+    "Value": "Wert",
+    "Setting ID": "Einstellungs-ID",
+    "Failed to save settings": "Einstellungen konnten nicht gespeichert werden",
+    "Show chat effects (animations when receiving e.g. confetti)": "Animierte Chateffekte zeigen, wenn z.B. Konfetti-Emojis erhalten werden"
 }

From de73cef7e61ea57e1750f246e0a9f7d9ef785472 Mon Sep 17 00:00:00 2001
From: libexus <Asterixeins324@gmail.com>
Date: Fri, 26 Feb 2021 18:02:04 +0000
Subject: [PATCH 081/420] Translated using Weblate (German)

Currently translated at 99.2% (2759 of 2780 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-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 ff754e7d7e..29b86ac641 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -636,7 +636,7 @@
     "Which officially provided instance you are using, if any": "Welche offiziell angebotene Instanz du nutzt, wenn überhaupt eine",
     "<a>In reply to</a> <pill>": "<a>Als Antwort auf</a> <pill>",
     "This room is not public. You will not be able to rejoin without an invite.": "Dies ist kein öffentlicher Raum. Du wirst diesen nicht ohne Einladung wieder beitreten können.",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s hat den Anzeigenamen zu %(displayName)s geändert.",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s hat den Anzeigenamen auf %(displayName)s geändert.",
     "Failed to set direct chat tag": "Fehler beim Setzen der Direkt-Chat-Markierung",
     "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",

From e3065f5a02533c38f0a7b770c519c5314d27880d Mon Sep 17 00:00:00 2001
From: Robin Townsend <robin@robin.town>
Date: Fri, 26 Feb 2021 17:09:54 -0500
Subject: [PATCH 082/420] Support sending invite reasons with MultiInviter

Signed-off-by: Robin Townsend <robin@robin.town>
---
 src/utils/MultiInviter.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/utils/MultiInviter.js b/src/utils/MultiInviter.js
index 7d1c900360..63d3942b37 100644
--- a/src/utils/MultiInviter.js
+++ b/src/utils/MultiInviter.js
@@ -53,13 +53,15 @@ export default class MultiInviter {
      * instance of the class.
      *
      * @param {array} addrs Array of addresses to invite
+     * @param {string} reason Reason for inviting (optional)
      * @returns {Promise} Resolved when all invitations in the queue are complete
      */
-    invite(addrs) {
+    invite(addrs, reason) {
         if (this.addrs.length > 0) {
             throw new Error("Already inviting/invited");
         }
         this.addrs.push(...addrs);
+        this.reason = reason;
 
         for (const addr of this.addrs) {
             if (getAddressType(addr) === null) {
@@ -123,7 +125,7 @@ export default class MultiInviter {
                 }
             }
 
-            return MatrixClientPeg.get().invite(roomId, addr);
+            return MatrixClientPeg.get().invite(roomId, addr, undefined, this.reason);
         } else {
             throw new Error('Unsupported address');
         }

From c25a8b70fa051afe102a301d146448f44cd51c3d Mon Sep 17 00:00:00 2001
From: Robin Townsend <robin@robin.town>
Date: Fri, 26 Feb 2021 17:10:20 -0500
Subject: [PATCH 083/420] Support sending invite reasons with /invite command

Signed-off-by: Robin Townsend <robin@robin.town>
---
 src/SlashCommands.tsx | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/SlashCommands.tsx b/src/SlashCommands.tsx
index 6b5f261374..aedcf7af8c 100644
--- a/src/SlashCommands.tsx
+++ b/src/SlashCommands.tsx
@@ -441,15 +441,14 @@ export const Commands = [
     }),
     new Command({
         command: 'invite',
-        args: '<user-id>',
+        args: '<user-id> [<reason>]',
         description: _td('Invites user with given id to current room'),
         runFn: function(roomId, args) {
             if (args) {
-                const matches = args.match(/^(\S+)$/);
-                if (matches) {
+                const [address, reason] = args.split(/\s+(.+)/);
+                if (address) {
                     // We use a MultiInviter to re-use the invite logic, even though
                     // we're only inviting one user.
-                    const address = matches[1];
                     // If we need an identity server but don't have one, things
                     // get a bit more complex here, but we try to show something
                     // meaningful.
@@ -490,7 +489,7 @@ export const Commands = [
                     }
                     const inviter = new MultiInviter(roomId);
                     return success(prom.then(() => {
-                        return inviter.invite([address]);
+                        return inviter.invite([address], reason);
                     }).then(() => {
                         if (inviter.getCompletionState(address) !== "invited") {
                             throw new Error(inviter.getErrorText(address));

From 208faf6d46e30a77db7f4dd4b6d6a2bd2dba138f Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 26 Feb 2021 22:21:14 -0700
Subject: [PATCH 084/420] Update velocity-animate to the latest beta

This is the primary change in this PR: the new beta (which has been untouched for a year as of writing) actually does a better job of handling concurrent read receipts, this patching holes.

The beta doesn't have the same leak as v1, so we can remove the metadata hack from our side (it doesn't use jQuery's data anymore).

Note that this change on its own introduces an annoying bug where every second update to a read receipt will throw it 14px to the right - more on that in the next commit.
---
 package.json        |  2 +-
 src/Velociraptor.js | 23 ++++-------------------
 yarn.lock           |  8 ++++----
 3 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/package.json b/package.json
index d4f931d811..10480b8af9 100644
--- a/package.json
+++ b/package.json
@@ -101,7 +101,7 @@
     "tar-js": "^0.3.0",
     "text-encoding-utf-8": "^1.0.2",
     "url": "^0.11.0",
-    "velocity-animate": "^1.5.2",
+    "velocity-animate": "^2.0.6",
     "what-input": "^5.2.10",
     "zxcvbn": "^4.4.2"
   },
diff --git a/src/Velociraptor.js b/src/Velociraptor.js
index ce52f60dbd..2da54babe5 100644
--- a/src/Velociraptor.js
+++ b/src/Velociraptor.js
@@ -118,25 +118,10 @@ export default class Velociraptor extends React.Component {
                     domNode.style.visibility = restingStyle.visibility;
                 });
 
-            /*
-            console.log("enter:",
-                        JSON.stringify(transitionOpts[i-1]),
-                        "->",
-                        JSON.stringify(restingStyle));
-            */
-        } else if (node === null) {
-            // Velocity stores data on elements using the jQuery .data()
-            // method, and assumes you'll be using jQuery's .remove() to
-            // remove the element, but we don't use jQuery, so we need to
-            // blow away the element's data explicitly otherwise it will leak.
-            // This uses Velocity's internal jQuery compatible wrapper.
-            // See the bug at
-            // https://github.com/julianshapiro/velocity/issues/300
-            // and the FAQ entry, "Preventing memory leaks when
-            // creating/destroying large numbers of elements"
-            // (https://github.com/julianshapiro/velocity/issues/47)
-            const domNode = ReactDom.findDOMNode(this.nodes[k]);
-            if (domNode) Velocity.Utilities.removeData(domNode);
+            // console.log("enter:",
+            //             JSON.stringify(transitionOpts[i-1]),
+            //             "->",
+            //             JSON.stringify(restingStyle));
         }
         this.nodes[k] = node;
     }
diff --git a/yarn.lock b/yarn.lock
index 01450908cc..5939a89f58 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8114,10 +8114,10 @@ validate-npm-package-license@^3.0.1:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
 
-velocity-animate@^1.5.2:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/velocity-animate/-/velocity-animate-1.5.2.tgz#5a351d75fca2a92756f5c3867548b873f6c32105"
-  integrity sha512-m6EXlCAMetKztO1ppBhGU1/1MR3IiEevO6ESq6rcrSQ3Q77xYSW13jkfXW88o4xMrkXJhy/U7j4wFR/twMB0Eg==
+velocity-animate@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/velocity-animate/-/velocity-animate-2.0.6.tgz#1811ca14df7fbbef05740256f6cec0fd1b76575f"
+  integrity sha512-tU+/UtSo3GkIjEfk2KM4e24DvpgX0+FzfLr7XqNwm9BCvZUtbCHPq/AFutx/Mkp2bXlUS9EcX8yxu8XmzAv2Kw==
 
 verror@1.10.0:
   version "1.10.0"

From b3142d613806ed243947ddbf304a33f6e97219b5 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 26 Feb 2021 22:24:36 -0700
Subject: [PATCH 085/420] Offset read receipt start positions by 1px

As mentioned in 208faf6d46e30a77db7f4dd4b6d6a2bd2dba138f, the velocity-animate update causes read receipts to occasionally show up 14px to the right of where they should be. This is because the read receipt width is 14px, and velocity-animate will *not* translate `left` if it isn't changing. Unfortunately, it's smart enough to realize that `-0px` is `0px`, so we end up having to specify `1px`.

The comment already mentions it, but this should have no perceived effect for the user. During development I could not tell if the 1px was being applied during the animation, implying that it's a meaningless value. It's a bit unfortunate for those who know that it's translating left by 1px, but hopefully they'll be able to unsee that in time.
---
 src/components/views/rooms/ReadReceiptMarker.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/views/rooms/ReadReceiptMarker.js b/src/components/views/rooms/ReadReceiptMarker.js
index c19247ef5a..f5c676b841 100644
--- a/src/components/views/rooms/ReadReceiptMarker.js
+++ b/src/components/views/rooms/ReadReceiptMarker.js
@@ -155,7 +155,13 @@ export default class ReadReceiptMarker extends React.Component {
 
         // then shift to the rightmost column,
         // and then it will drop down to its resting position
-        startStyles.push({ top: startTopOffset+'px', left: '0px' });
+        //
+        // XXX: We use a `left: 1px` to trick velocity-animate into actually animating. This
+        // is a very annoying bug where if it thinks there's no change to `left` then it'll
+        // skip applying it, thus making our read receipt at +14px instead of +0px like it
+        // should be. This does cause 1px of drift for read receipts, however nobody should
+        // notice this while it's also falling.
+        startStyles.push({ top: startTopOffset+'px', left: '1px' });
         enterTransitionOpts.push({
             duration: bounce ? Math.min(Math.log(Math.abs(startTopOffset)) * 200, 3000) : 300,
             easing: bounce ? 'easeOutBounce' : 'easeOutCubic',

From 76ad93b9370e2e6922b54f2268a0d4f9ebe3dc9e Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 26 Feb 2021 22:25:50 -0700
Subject: [PATCH 086/420] Put speed holes in the code

We can make read receipts more efficient (and avoid double-animation) by using `PureComponent` which no-ops useless updates for us.
---
 src/components/views/rooms/ReadReceiptMarker.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/rooms/ReadReceiptMarker.js b/src/components/views/rooms/ReadReceiptMarker.js
index f5c676b841..8b2f5d27b5 100644
--- a/src/components/views/rooms/ReadReceiptMarker.js
+++ b/src/components/views/rooms/ReadReceiptMarker.js
@@ -32,7 +32,7 @@ try {
 } catch (e) {
 }
 
-export default class ReadReceiptMarker extends React.Component {
+export default class ReadReceiptMarker extends React.PureComponent {
     static propTypes = {
         // the RoomMember to show the RR for
         member: PropTypes.object,

From 0dd4d45c49eeb985c7febda543145021c49aa92f Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 26 Feb 2021 22:36:42 -0700
Subject: [PATCH 087/420] Disable velocity mock option

This appears to have been removed in the beta
---
 test/components/structures/MessagePanel-test.js | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/test/components/structures/MessagePanel-test.js b/test/components/structures/MessagePanel-test.js
index f40f8c5187..2fd5bd6ad1 100644
--- a/test/components/structures/MessagePanel-test.js
+++ b/test/components/structures/MessagePanel-test.js
@@ -35,7 +35,6 @@ const mockclock = require('../../mock-clock');
 import Adapter from "enzyme-adapter-react-16";
 import { configure, mount } from "enzyme";
 
-import Velocity from 'velocity-animate';
 import MatrixClientContext from "../../../src/contexts/MatrixClientContext";
 import RoomContext from "../../../src/contexts/RoomContext";
 import DMRoomMap from "../../../src/utils/DMRoomMap";
@@ -75,18 +74,10 @@ describe('MessagePanel', function() {
             return arg === "showDisplaynameChanges";
         });
 
-        // This option clobbers the duration of all animations to be 1ms
-        // which makes unit testing a lot simpler (the animation doesn't
-        // complete without this even if we mock the clock and tick it
-        // what should be the correct amount of time).
-        Velocity.mock = true;
-
         DMRoomMap.makeShared();
     });
 
     afterEach(function() {
-        delete Velocity.mock;
-
         clock.uninstall();
     });
 

From 905f5300f49e2770d77d8d3e9c86484735bcbdaa Mon Sep 17 00:00:00 2001
From: Nikita Epifanov <NikGreens@protonmail.com>
Date: Thu, 25 Feb 2021 11:01:31 +0000
Subject: [PATCH 088/420] Translated using Weblate (Russian)

Currently translated at 99.4% (2765 of 2780 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ru/
---
 src/i18n/strings/ru.json | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index a72eef2c58..65aeaf82d9 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -3057,5 +3057,20 @@
     "Your homeserver was unreachable and was not able to log you in. Please try again. If this continues, please contact your homeserver administrator.": "Ваш домашний сервер был недоступен, и мы не смогли войти в систему. Пожалуйста, попробуйте снова через пару минут. Если ситуация по-прежнему не меняется, обратитесь к администратору домашнего сервера за дополнительной информацией.",
     "Try again": "Попробовать ещё раз",
     "We asked the browser to remember which homeserver you use to let you sign in, but unfortunately your browser has forgotten it. Go to the sign in page and try again.": "Мы попросили браузер запомнить, какой домашний сервер вы используете для входа в систему, но, к сожалению, ваш браузер забыл об этом. Перейдите на страницу входа и попробуйте ещё раз.",
-    "We couldn't log you in": "Нам не удалось войти в систему"
+    "We couldn't log you in": "Нам не удалось войти в систему",
+    "Upgrade to %(hostSignupBrand)s": "Перейти на %(hostSignupBrand)s",
+    "Edit Values": "Изменить значения",
+    "Value in this room:": "Значение в этой комнате:",
+    "Value:": "Значение:",
+    "Setting:": "Настройки:",
+    "Setting ID": "ID настроек",
+    "Save setting values": "Сохранить значения настроек",
+    "Settable at room": "Устанавливается для комнаты",
+    "Settable at global": "Устанавливается на глобальном уровне",
+    "Level": "Уровень",
+    "This UI does NOT check the types of the values. Use at your own risk.": "Этот пользовательский интерфейс НЕ проверяет типы значений. Используйте на свой риск.",
+    "Value in this room": "Значение в этой комнате",
+    "Value": "Значение",
+    "Failed to save settings": "Не удалось сохранить настройки",
+    "Show chat effects (animations when receiving e.g. confetti)": "Показать эффекты чата (анимация при получении, например, конфетти)"
 }

From 4b771b0634594dcc8205fcc19ac49e107079c24f Mon Sep 17 00:00:00 2001
From: libexus <Asterixeins324@gmail.com>
Date: Sat, 27 Feb 2021 14:58:24 +0000
Subject: [PATCH 089/420] Translated using Weblate (German)

Currently translated at 99.2% (2759 of 2780 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-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 29b86ac641..e2e2e0718a 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1569,7 +1569,7 @@
     "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s hat die alternative Adresse %(addresses)s für diesen Raum entfernt.",
     "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s hat die alternative Adresse für diesen Raum geändert.",
     "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s hat die Haupt- und Alternativadressen für diesen Raum geändert.",
-    "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s entfernte die Ausschluss-Regel für Nutzer!nnen, die %(glob)s entsprechen",
+    "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s entfernte die Ausschluss-Regel für Benutzer:innen, die %(glob)s entsprechen",
     "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s entfernte die Ausschluss-Regel für Räume, die %(glob)s entsprechen",
     "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s entfernte die Ausschluss-Regel für Server, die %(glob)s entsprechen",
     "%(senderName)s removed a ban rule matching %(glob)s": "%(senderName)s entfernte die Ausschluss-Regel, die %(glob)s entspricht",
@@ -2567,7 +2567,7 @@
     "See when the name changes in this room": "Sehen wenn sich der Name in diesem Raum ändert",
     "Change the name of your active room": "Den Namen deines aktiven Raums ändern",
     "See when the name changes in your active room": "Sehen wenn der Name sich in deinem aktiven Raum ändert",
-    "Change the avatar of this room": "Avatar von diesem Raum ändern",
+    "Change the avatar of this room": "Icon von diesem Raum ändern",
     "See when the avatar changes in this room": "Sehen wenn der Avatar sich in diesem Raum ändert",
     "Change the avatar of your active room": "Den Avatar deines aktiven Raums ändern",
     "See when the avatar changes in your active room": "Sehen wenn ein Avatar in deinem aktiven Raum geändert wird",
@@ -3036,7 +3036,7 @@
     "Converts the room to a DM": "Wandelt den Raum zu Direktnachricht um",
     "Something went wrong in confirming your identity. Cancel and try again.": "Bei der Bestätigung deiner Identität ist ein Fehler aufgetreten. Abbrechen und erneut versuchen.",
     "Use app": "App verwenden",
-    "Element Web is experimental on mobile. For a better experience and the latest features, use our free native app.": "Element Web ist experimentell auf mobilen Endgeräten. Für eine bessere Erfahrung und die neuesten Erweiterungen, nutze unsere freie, native App.",
+    "Element Web is experimental on mobile. For a better experience and the latest features, use our free native app.": "Element Web ist auf mobilen Endgeräten experimentell. Für eine bessere Erfahrung und die neuesten Features, nutze unsere freie, native App.",
     "Use app for a better experience": "Nutze die App für eine bessere Erfahrung",
     "We asked the browser to remember which homeserver you use to let you sign in, but unfortunately your browser has forgotten it. Go to the sign in page and try again.": "Wir haben deinen Browser gebeten, sich zu merken, bei welchem Homeserver du dich anmeldest, aber dein Browser hat dies leider vergessen. Gehe zur Anmeldeseite und versuche es erneut.",
     "Show stickers button": "Sticker-Schaltfläche anzeigen",

From 844ed6b0b9c5e8a99aad99192e9506b047d72904 Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Fri, 26 Feb 2021 18:04:45 +0000
Subject: [PATCH 090/420] Translated using Weblate (German)

Currently translated at 99.2% (2759 of 2780 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-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 e2e2e0718a..b615cda081 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -636,7 +636,7 @@
     "Which officially provided instance you are using, if any": "Welche offiziell angebotene Instanz du nutzt, wenn überhaupt eine",
     "<a>In reply to</a> <pill>": "<a>Als Antwort auf</a> <pill>",
     "This room is not public. You will not be able to rejoin without an invite.": "Dies ist kein öffentlicher Raum. Du wirst diesen nicht ohne Einladung wieder beitreten können.",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s hat den Anzeigenamen auf %(displayName)s geändert.",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s hat den Anzeigenamen zu %(displayName)s geändert.",
     "Failed to set direct chat tag": "Fehler beim Setzen der Direkt-Chat-Markierung",
     "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",
@@ -2664,7 +2664,7 @@
     "Fill Screen": "Bildschirm ausfüllen",
     "Voice Call": "Sprachanruf",
     "Video Call": "Videoanruf",
-    "Remain on your screen while running": "Bleiben Sie auf Ihrem Bildschirm während der Ausführung von",
+    "Remain on your screen while running": "Bleib auf deinem Bildschirm während der Ausführung von",
     "Remain on your screen when viewing another room, when running": "Bleiben Sie auf Ihrem Bildschirm, während Sie einen anderen Raum betrachten, wenn Sie ausführen",
     "Zimbabwe": "Simbabwe",
     "Zambia": "Sambia",

From e43853d6b0aeda0dd0cf342e378977167a9ae614 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 27 Feb 2021 12:02:24 -0700
Subject: [PATCH 091/420] Use a small fractional value instead

---
 src/components/views/rooms/ReadReceiptMarker.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/components/views/rooms/ReadReceiptMarker.js b/src/components/views/rooms/ReadReceiptMarker.js
index 8b2f5d27b5..ba2b3064fd 100644
--- a/src/components/views/rooms/ReadReceiptMarker.js
+++ b/src/components/views/rooms/ReadReceiptMarker.js
@@ -156,12 +156,14 @@ export default class ReadReceiptMarker extends React.PureComponent {
         // then shift to the rightmost column,
         // and then it will drop down to its resting position
         //
-        // XXX: We use a `left: 1px` to trick velocity-animate into actually animating. This
-        // is a very annoying bug where if it thinks there's no change to `left` then it'll
+        // XXX: We use a fractional left value to trick velocity-animate into actually animating.
+        // This is a very annoying bug where if it thinks there's no change to `left` then it'll
         // skip applying it, thus making our read receipt at +14px instead of +0px like it
-        // should be. This does cause 1px of drift for read receipts, however nobody should
-        // notice this while it's also falling.
-        startStyles.push({ top: startTopOffset+'px', left: '1px' });
+        // should be. This does cause a tiny amount of drift for read receipts, however with a
+        // value so small it's not perceived by a user.
+        // Note: Any smaller values (or trying to interchange units) might cause read receipts to
+        // fail to fall down or cause gaps.
+        startStyles.push({ top: startTopOffset+'px', left: '0.001px' });
         enterTransitionOpts.push({
             duration: bounce ? Math.min(Math.log(Math.abs(startTopOffset)) * 200, 3000) : 300,
             easing: bounce ? 'easeOutBounce' : 'easeOutCubic',

From 188b728f5311e0c607623a58cc336fa434d07b31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Sun, 28 Feb 2021 13:32:17 +0100
Subject: [PATCH 092/420] Fix read receipts for compact layout
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 res/css/views/rooms/_GroupLayout.scss | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/res/css/views/rooms/_GroupLayout.scss b/res/css/views/rooms/_GroupLayout.scss
index 543e6ed685..903fabc8fd 100644
--- a/res/css/views/rooms/_GroupLayout.scss
+++ b/res/css/views/rooms/_GroupLayout.scss
@@ -105,16 +105,9 @@ $left-gutter: 64px;
         }
 
         .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;
+            // This aligns the avatar with the last line of the
+            // message. We want to move it one line up - 2rem
+            top: -2rem;
         }
 
         .mx_EventTile_content .markdown-body {

From 94fbd7c9b127faaab1c668a101b6b0506798d767 Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Sat, 27 Feb 2021 14:58:41 +0000
Subject: [PATCH 093/420] Translated using Weblate (German)

Currently translated at 99.2% (2759 of 2780 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-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 b615cda081..8a07b6cd9f 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -3036,7 +3036,7 @@
     "Converts the room to a DM": "Wandelt den Raum zu Direktnachricht um",
     "Something went wrong in confirming your identity. Cancel and try again.": "Bei der Bestätigung deiner Identität ist ein Fehler aufgetreten. Abbrechen und erneut versuchen.",
     "Use app": "App verwenden",
-    "Element Web is experimental on mobile. For a better experience and the latest features, use our free native app.": "Element Web ist auf mobilen Endgeräten experimentell. Für eine bessere Erfahrung und die neuesten Features, nutze unsere freie, native App.",
+    "Element Web is experimental on mobile. For a better experience and the latest features, use our free native app.": "Element Web ist auf mobilen Endgeräten experimentell. Für eine bessere Erfahrung und die neuesten Erweiterungen, nutze unsere freie, native App.",
     "Use app for a better experience": "Nutze die App für eine bessere Erfahrung",
     "We asked the browser to remember which homeserver you use to let you sign in, but unfortunately your browser has forgotten it. Go to the sign in page and try again.": "Wir haben deinen Browser gebeten, sich zu merken, bei welchem Homeserver du dich anmeldest, aber dein Browser hat dies leider vergessen. Gehe zur Anmeldeseite und versuche es erneut.",
     "Show stickers button": "Sticker-Schaltfläche anzeigen",

From d6d5455a11915a313b137b4a8f98bde762441117 Mon Sep 17 00:00:00 2001
From: Thibault Martin <mail@thibaultmart.in>
Date: Thu, 25 Feb 2021 17:17:39 +0000
Subject: [PATCH 094/420] Translated using Weblate (French)

Currently translated at 99.2% (2758 of 2780 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fr/
---
 src/i18n/strings/fr.json | 260 +++++++++++++++++++--------------------
 1 file changed, 130 insertions(+), 130 deletions(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index c942cae520..304599cd44 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1,6 +1,6 @@
 {
     "Disinvite": "Désinviter",
-    "Displays action": "Affiche l'action",
+    "Displays action": "Affiche l’action",
     "Download %(text)s": "Télécharger %(text)s",
     "Emoji": "Émojis",
     "%(senderName)s ended the call.": "%(senderName)s a terminé l’appel.",
@@ -32,14 +32,14 @@
     "%(senderName)s banned %(targetName)s.": "%(senderName)s a banni %(targetName)s.",
     "Ban": "Bannir",
     "Banned users": "Utilisateurs bannis",
-    "Bans user with given id": "Bannit l'utilisateur à partir de son identifiant",
+    "Bans user with given id": "Bannit l’utilisateur à partir de son identifiant",
     "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.",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s a changé le rang de %(powerLevelDiffText)s.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s a changé le nom du salon en %(roomName)s.",
-    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s a changé le sujet du salon en \"%(topic)s\".",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s a changé le sujet du salon en « %(topic)s ».",
     "Changes your display nickname": "Change votre nom affiché",
     "Click here to fix": "Cliquer ici pour réparer",
     "Click to mute audio": "Cliquer pour couper le son",
@@ -54,7 +54,7 @@
     "Create Room": "Créer un salon",
     "Cryptography": "Chiffrement",
     "Current password": "Mot de passe actuel",
-    "/ddg is not a command": "/ddg n'est pas une commande",
+    "/ddg is not a command": "/ddg n’est pas une commande",
     "Deactivate Account": "Fermer le compte",
     "Decrypt %(text)s": "Déchiffrer %(text)s",
     "Deops user with given id": "Retire le rang d’opérateur d’un utilisateur à partir de son identifiant",
@@ -66,7 +66,7 @@
     "Failed to reject invite": "Échec du rejet de l'invitation",
     "Failed to reject invitation": "Échec du rejet de l'invitation",
     "Failed to send email": "Échec de l’envoi de l’e-mail",
-    "Failed to send request.": "Échec de l'envoi de la requête.",
+    "Failed to send request.": "Échec de l’envoi de la requête.",
     "Failed to set display name": "Échec de l'enregistrement du nom affiché",
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s a accepté l’invitation de %(displayName)s.",
     "Access Token:": "Jeton d’accès :",
@@ -101,17 +101,17 @@
     "%(targetName)s joined the room.": "%(targetName)s a rejoint le salon.",
     "%(senderName)s kicked %(targetName)s.": "%(senderName)s a expulsé %(targetName)s.",
     "Kick": "Expulser",
-    "Kicks user with given id": "Expulse l'utilisateur à partir de son identifiant",
+    "Kicks user with given id": "Expulse l’utilisateur à partir de son identifiant",
     "Labs": "Labo",
     "Leave room": "Quitter le salon",
     "%(targetName)s left the room.": "%(targetName)s a quitté le salon.",
     "Logout": "Se déconnecter",
     "Low priority": "Priorité basse",
-    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s a rendu l'historique visible à tous les membres du salon, depuis le moment où ils ont été invités.",
-    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s a rendu l'historique visible à tous les membres du salon, depuis le moment où ils ont rejoint.",
-    "%(senderName)s made future room history visible to all room members.": "%(senderName)s a rendu l'historique visible à tous les membres du salon.",
-    "%(senderName)s made future room history visible to anyone.": "%(senderName)s a rendu l'historique visible à n'importe qui.",
-    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s a rendu l'historique visible à inconnu (%(visibility)s).",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s a rendu l’historique visible à tous les membres du salon, depuis le moment où ils ont été invités.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s a rendu l’historique visible à tous les membres du salon, à partir de leur arrivée.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s a rendu l’historique visible à tous les membres du salon.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s a rendu l’historique visible à tout le monde.",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s a rendu l’historique visible à inconnu (%(visibility)s).",
     "Manage Integrations": "Gestion des intégrations",
     "Missing room_id in request": "Absence du room_id dans la requête",
     "Missing user_id in request": "Absence du user_id dans la requête",
@@ -120,7 +120,7 @@
     "New passwords don't match": "Les mots de passe ne correspondent pas",
     "New passwords must match each other.": "Les nouveaux mots de passe doivent être identiques.",
     "not specified": "non spécifié",
-    "(not supported by this browser)": "(non supporté par ce navigateur)",
+    "(not supported by this browser)": "(non pris en charge par ce navigateur)",
     "<not supported>": "<non supporté>",
     "No more results": "Fin des résultats",
     "No results": "Pas de résultat",
@@ -141,7 +141,7 @@
     "No users have specific privileges in this room": "Aucun utilisateur n’a de privilège spécifique dans ce salon",
     "olm version:": "version de olm :",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Veuillez vérifier vos e-mails et cliquer sur le lien que vous avez reçu. Puis cliquez sur continuer.",
-    "Power level must be positive integer.": "Le niveau d'autorité doit être un entier positif.",
+    "Power level must be positive integer.": "Le rang doit être un entier positif.",
     "Privileged Users": "Utilisateurs privilégiés",
     "Profile": "Profil",
     "Reason": "Raison",
@@ -151,10 +151,10 @@
     "%(senderName)s removed their profile picture.": "%(senderName)s a supprimé son image de profil.",
     "%(senderName)s requested a VoIP conference.": "%(senderName)s a demandé une téléconférence audio.",
     "Return to login screen": "Retourner à l’écran de connexion",
-    "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s n’a pas la permission de vous envoyer des notifications - merci de vérifier les paramètres de votre navigateur",
-    "%(brand)s was not given permission to send notifications - please try again": "%(brand)s n’a pas reçu la permission de vous envoyer des notifications - veuillez réessayer",
+    "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s n’a pas l’autorisation de vous envoyer des notifications - merci de vérifier les paramètres de votre navigateur",
+    "%(brand)s was not given permission to send notifications - please try again": "%(brand)s n’a pas reçu l’autorisation de vous envoyer des notifications - veuillez réessayer",
     "%(brand)s version:": "Version de %(brand)s :",
-    "Room %(roomId)s not visible": "Le salon %(roomId)s n'est pas visible",
+    "Room %(roomId)s not visible": "Le salon %(roomId)s n’est pas visible",
     "Room Colour": "Couleur du salon",
     "Rooms": "Salons",
     "Search": "Rechercher",
@@ -165,7 +165,7 @@
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s a invité %(targetDisplayName)s à rejoindre le salon.",
     "Server error": "Erreur du serveur",
     "Server may be unavailable, overloaded, or search timed out :(": "Le serveur semble être inaccessible, surchargé ou la recherche a expiré :(",
-    "Server may be unavailable, overloaded, or you hit a bug.": "Le serveur semble être indisponible, surchargé ou vous avez rencontré un problème.",
+    "Server may be unavailable, overloaded, or you hit a bug.": "Le serveur semble être indisponible, surchargé ou vous êtes tombé sur un bug.",
     "Server unavailable, overloaded, or something else went wrong.": "Le serveur semble être inaccessible, surchargé ou quelque chose s'est mal passé.",
     "Session ID": "Identifiant de session",
     "%(senderName)s set a profile picture.": "%(senderName)s a défini une image de profil.",
@@ -175,7 +175,7 @@
     "Sign in": "Se connecter",
     "Sign out": "Se déconnecter",
     "%(count)s of your messages have not been sent.|other": "Certains de vos messages n’ont pas été envoyés.",
-    "Someone": "Quelqu'un",
+    "Someone": "Quelqu’un",
     "Submit": "Soumettre",
     "Success": "Succès",
     "This email address is already in use": "Cette adresse e-mail est déjà utilisée",
@@ -183,7 +183,7 @@
     "The email address linked to your account must be entered.": "L’adresse e-mail liée à votre compte doit être renseignée.",
     "The remote side failed to pick up": "Le correspondant n’a pas décroché",
     "This room has no local addresses": "Ce salon n'a pas d'adresse locale",
-    "This room is not recognised.": "Ce salon n'est pas reconnu.",
+    "This room is not recognised.": "Ce salon n’est pas reconnu.",
     "This doesn't appear to be a valid email address": "Cette adresse e-mail ne semble pas valide",
     "This phone number is already in use": "Ce numéro de téléphone est déjà utilisé",
     "This room is not accessible by remote Matrix servers": "Ce salon n’est pas accessible par les serveurs Matrix distants",
@@ -195,8 +195,8 @@
     "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 faire une capture d'écran",
-    "Unable to enable Notifications": "Impossible d'activer les notifications",
+    "Unable to capture screen": "Impossible de faire une capture d’écran",
+    "Unable to enable Notifications": "Impossible d’activer les notifications",
     "Unmute": "Activer le son",
     "Upload avatar": "Télécharger une photo de profil",
     "Upload Failed": "Échec de l’envoi",
@@ -208,19 +208,19 @@
     "Voice call": "Appel vocal",
     "VoIP conference finished.": "Téléconférence VoIP terminée.",
     "VoIP conference started.": "Téléconférence VoIP démarrée.",
-    "VoIP is unsupported": "Voix sur IP non gérée",
+    "VoIP is unsupported": "Voix sur IP non prise en charge",
     "Warning!": "Attention !",
     "Who can access this room?": "Qui peut accéder au salon ?",
     "Who can read history?": "Qui peut lire l'historique ?",
     "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s a annulé l’invitation de %(targetName)s.",
     "You are already in a call.": "Vous avez déjà un appel en cours.",
-    "You cannot place a call with yourself.": "Vous ne pouvez pas passer d'appel avec vous-même.",
-    "You cannot place VoIP calls in this browser.": "Vous ne pouvez pas passer d'appel en Voix sur IP dans ce navigateur.",
+    "You cannot place a call with yourself.": "Vous ne pouvez pas passer d’appel avec vous-même.",
+    "You cannot place VoIP calls in this browser.": "Vous ne pouvez pas passer d’appel en Voix sur IP dans ce navigateur.",
     "You do not have permission to post to this room": "Vous n’avez pas la permission de poster dans ce salon",
     "You have no visible notifications": "Vous n'avez pas de notification visible",
-    "You need to be able to invite users to do that.": "Vous devez être capable d’inviter des utilisateurs pour faire ça.",
+    "You need to be able to invite users to do that.": "Vous devez avoir l’autorisation d’inviter des utilisateurs pour faire ceci.",
     "You need to be logged in.": "Vous devez être identifié.",
-    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Votre adresse e-mail ne semble pas être associée à un identifiant Matrix sur ce serveur d'accueil.",
+    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Votre adresse e-mail ne semble pas être associée à un identifiant Matrix sur ce serveur d’accueil.",
     "You seem to be in a call, are you sure you want to quit?": "Vous semblez avoir un appel en cours, voulez-vous vraiment partir ?",
     "You seem to be uploading files, are you sure you want to quit?": "Vous semblez être en train d'envoyer des fichiers, voulez-vous vraiment partir ?",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Vous ne pourrez pas annuler cette modification car vous promouvez l’utilisateur au même rang que le vôtre.",
@@ -377,7 +377,7 @@
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (rang %(powerLevelNumber)s)",
     "(could not connect media)": "(impossible de se connecter au média)",
     "(no answer)": "(pas de réponse)",
-    "(unknown failure: %(reason)s)": "(erreur inconnue : %(reason)s)",
+    "(unknown failure: %(reason)s)": "(erreur inconnue : %(reason)s)",
     "Your browser does not support the required cryptography extensions": "Votre navigateur ne supporte pas les extensions cryptographiques nécessaires",
     "Not a valid %(brand)s keyfile": "Fichier de clé %(brand)s non valide",
     "Authentication check failed: incorrect password?": "Erreur d’authentification : mot de passe incorrect ?",
@@ -388,13 +388,13 @@
     "Add a widget": "Ajouter un widget",
     "Allow": "Autoriser",
     "Delete widget": "Supprimer le widget",
-    "Define the power level of a user": "Définir le rang d'un utilisateur",
+    "Define the power level of a user": "Définir le rang d’un utilisateur",
     "Edit": "Modifier",
     "Enable automatic language detection for syntax highlighting": "Activer la détection automatique de la langue pour la correction orthographique",
     "To get started, please pick a username!": "Pour commencer, choisissez un nom d'utilisateur !",
     "Unable to create widget.": "Impossible de créer le widget.",
-    "You are not in this room.": "Vous n'êtes pas dans ce salon.",
-    "You do not have permission to do that in this room.": "Vous n'avez pas la permission d'effectuer cette action dans ce salon.",
+    "You are not in this room.": "Vous n’êtes pas dans ce salon.",
+    "You do not have permission to do that in this room.": "Vous n’avez pas l’autorisation d’effectuer cette action dans ce salon.",
     "Example": "Exemple",
     "Create": "Créer",
     "Featured Rooms:": "Salons mis en avant :",
@@ -411,21 +411,21 @@
     "Copied!": "Copié !",
     "Failed to copy": "Échec de la copie",
     "%(widgetName)s widget modified by %(senderName)s": "Widget %(widgetName)s modifié par %(senderName)s",
-    "Who would you like to add to this community?": "Qui souhaitez-vous ajouter à cette communauté ?",
-    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Attention : toute personne ajoutée à une communauté sera visible par tous ceux connaissant l'identifiant de la communauté",
-    "Invite new community members": "Inviter de nouveaux membres dans cette communauté",
-    "Which rooms would you like to add to this community?": "Quels salons souhaitez-vous ajouter à cette communauté ?",
+    "Who would you like to add to this community?": "Qui souhaitez-vous ajouter à cette communauté ?",
+    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Attention : toute personne ajoutée à une communauté sera visible par tous ceux connaissant l’identifiant de la communauté",
+    "Invite new community members": "Inviter de nouvelles personnes dans cette communauté",
+    "Which rooms would you like to add to this community?": "Quels salons souhaitez-vous ajouter à cette communauté ?",
     "Add rooms to the community": "Ajouter des salons à la communauté",
     "Add to community": "Ajouter à la communauté",
-    "Failed to invite the following users to %(groupId)s:": "Échec de l'invitation des utilisateurs à %(groupId)s :",
-    "Failed to invite users to community": "Échec de l'invitation d'utilisateurs à la communauté",
-    "Failed to invite users to %(groupId)s": "Échec de l'invitation d'utilisateurs à %(groupId)s",
-    "Failed to add the following rooms to %(groupId)s:": "Échec de l'ajout des salons suivants à %(groupId)s :",
+    "Failed to invite the following users to %(groupId)s:": "Échec de l’invitation des utilisateurs suivants à %(groupId)s :",
+    "Failed to invite users to community": "Échec de l’invitation des utilisateurs à la communauté",
+    "Failed to invite users to %(groupId)s": "Échec de l’invitation des utilisateurs à %(groupId)s",
+    "Failed to add the following rooms to %(groupId)s:": "Échec de l’ajout des salons suivants à %(groupId)s :",
     "Ignored user": "Utilisateur ignoré",
-    "You are now ignoring %(userId)s": "Dorénavant vous ignorez %(userId)s",
-    "Unignored user": "Utilisateur n'étant plus ignoré",
-    "You are no longer ignoring %(userId)s": "Vous n'ignorez plus %(userId)s",
-    "Invite to Community": "Inviter dans la Communauté",
+    "You are now ignoring %(userId)s": "Vous ignorez désormais %(userId)s",
+    "Unignored user": "L’utilisateur n’est plus ignoré",
+    "You are no longer ignoring %(userId)s": "Vous n’ignorez plus %(userId)s",
+    "Invite to Community": "Inviter dans la communauté",
     "Communities": "Communautés",
     "Message Pinning": "Épingler un message",
     "Mention": "Mentionner",
@@ -573,7 +573,7 @@
     "Mirror local video feed": "Inverser horizontalement la vidéo locale (effet miroir)",
     "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Un e-mail a été envoyé à %(emailAddress)s. Après avoir suivi le lien présent dans celui-ci, cliquez ci-dessous.",
     "Ignores a user, hiding their messages from you": "Ignore un utilisateur, en masquant ses messages",
-    "Stops ignoring a user, showing their messages going forward": "N'ignore plus un utilisateur, en affichant ses messages à partir de maintenant",
+    "Stops ignoring a user, showing their messages going forward": "Arrête d’ignorer un utilisateur, en affichant ses messages à partir de maintenant",
     "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "La visibilité de \"%(roomName)s\" dans %(groupId)s n'a pas pu être mise à jour.",
     "Visibility in Room List": "Visibilité dans la liste des salons",
     "Visible to everyone": "Visible pour tout le monde",
@@ -609,7 +609,7 @@
     "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": "L'appel a échoué",
+    "Call Failed": "L’appel a échoué",
     "Send": "Envoyer",
     "Old cryptography data detected": "Anciennes données de chiffrement détectées",
     "Data from an older version of %(brand)s 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.": "Nous avons détecté des données d'une ancienne version de %(brand)s. Le chiffrement de bout en bout n'aura pas fonctionné correctement sur l'ancienne version. Les messages chiffrés échangés récemment dans l'ancienne version ne sont peut-être pas déchiffrables dans cette version. Les échanges de message avec cette version peuvent aussi échouer. Si vous rencontrez des problèmes, déconnectez-vous puis reconnectez-vous. Pour conserver l'historique des messages, exportez puis réimportez vos clés de chiffrement.",
@@ -625,13 +625,13 @@
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Le respect de votre vie privée est important pour nous, donc nous ne collectons aucune donnée personnelle ou permettant de vous identifier pour nos statistiques.",
     "Learn more about how we use analytics.": "En savoir plus sur notre utilisation des statistiques.",
     "The information being sent to us to help make %(brand)s better includes:": "Les informations qui nous sont envoyées et qui nous aident à améliorer %(brand)s comportent :",
-    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Si la page contient des informations permettant de vous identifier, comme un salon, un identifiant d'utilisateur ou de groupe, ces données sont enlevées avant qu'elle ne soit envoyée au serveur.",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Si la page contient des informations permettant de vous identifier, comme un salon, un identifiant d’utilisateur ou de groupe, ces données sont enlevées avant qu’elle ne soit envoyée au serveur.",
     "The platform you're on": "La plateforme que vous utilisez",
     "The version of %(brand)s": "La version de %(brand)s",
     "Your language of choice": "La langue que vous avez choisie",
-    "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",
+    "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",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s %(day)s %(monthName)s %(fullYear)s",
     "This room is not public. You will not be able to rejoin without an invite.": "Ce salon n'est pas public. Vous ne pourrez pas y revenir sans invitation.",
     "Community IDs cannot be empty.": "Les identifiants de communauté ne peuvent pas être vides.",
@@ -648,7 +648,7 @@
     "Code": "Code",
     "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Si vous avez signalé un bug via GitHub, les journaux de débogage peuvent nous aider à identifier le problème. Les journaux de débogage contiennent des données d'utilisation de l'application dont votre nom d'utilisateur, les identifiants ou alias des salons ou groupes que vous avez visité et les noms d'utilisateur des autres participants. Ils ne contiennent pas les messages.",
     "Submit debug logs": "Envoyer les journaux de débogage",
-    "Opens the Developer Tools dialog": "Ouvre la fenêtre des Outils de développeur",
+    "Opens the Developer Tools dialog": "Ouvre la fenêtre des outils de développeur",
     "Unable to join community": "Impossible de rejoindre la communauté",
     "Unable to leave community": "Impossible de quitter la communauté",
     "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Les changements effectués au <bold1>nom</bold1> et à l'<bold2>avatar</bold2> de votre communauté peuvent prendre jusqu'à 30 minutes avant d'être vus par d'autres utilisateurs.",
@@ -784,7 +784,7 @@
     "Preparing to send logs": "Préparation d'envoi des journaux",
     "Missing roomId.": "Identifiant de salon manquant.",
     "Popout widget": "Détacher le widget",
-    "Every page you use in the app": "Toutes les pages que vous utilisez dans l'application",
+    "Every page you use in the app": "Toutes les pages que vous utilisez dans l’application",
     "e.g. <CurrentPageURL>": "par ex. <CurrentPageURL>",
     "Your device resolution": "La résolution de votre appareil",
     "Always show encryption icons": "Toujours afficher les icônes de chiffrement",
@@ -832,8 +832,8 @@
     "Demote yourself?": "Vous rétrograder ?",
     "Demote": "Rétrograder",
     "This event could not be displayed": "Cet événement n'a pas pu être affiché",
-    "Permission Required": "Permission requise",
-    "You do not have permission to start a conference call in this room": "Vous n'avez pas la permission de lancer un appel en téléconférence dans ce salon",
+    "Permission Required": "Autorisation requise",
+    "You do not have permission to start a conference call in this room": "Vous n’avez pas l’autorisation de lancer un appel en téléconférence dans ce salon",
     "A call is currently being placed!": "Un appel est en cours !",
     "Failed to remove widget": "Échec de la suppression du widget",
     "An error ocurred whilst trying to remove the widget from the room": "Une erreur est survenue lors de la suppression du widget du salon",
@@ -862,8 +862,8 @@
     "Upgrade this room to version %(version)s": "Mettre à niveau ce salon vers la version %(version)s",
     "Forces the current outbound group session in an encrypted room to be discarded": "Force la session de groupe sortante actuelle dans un salon chiffré à être rejetée",
     "Unable to connect to Homeserver. Retrying...": "Impossible de se connecter au serveur d'accueil. Reconnexion...",
-    "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s a défini l'adresse principale pour ce salon comme %(address)s.",
-    "%(senderName)s removed the main address for this room.": "%(senderName)s a supprimé l'adresse principale de ce salon.",
+    "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s a défini l’adresse principale pour ce salon comme %(address)s.",
+    "%(senderName)s removed the main address for this room.": "%(senderName)s a supprimé l’adresse principale de ce salon.",
     "%(brand)s now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!": "%(brand)s utilise maintenant 3 à 5 fois moins de mémoire, en ne chargeant les informations des autres utilisateurs que quand elles sont nécessaires. Veuillez patienter pendant que l'on se resynchronise avec le serveur !",
     "Updating %(brand)s": "Mise à jour de %(brand)s",
     "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Avant de soumettre vos journaux, vous devez <a>créer une « issue » sur GitHub</a> pour décrire votre problème.",
@@ -934,7 +934,7 @@
     "Common names and surnames are easy to guess": "Les noms et prénoms répandus sont faciles à deviner",
     "Use a longer keyboard pattern with more turns": "Utilisez un schéma plus long et avec plus de variations",
     "Failed to load group members": "Échec du chargement des membres du groupe",
-    "Failed to invite users to the room:": "Échec de l'invitation d'utilisateurs dans le salon :",
+    "Failed to invite users to the room:": "Échec de l’invitation d'utilisateurs dans le salon :",
     "There was an error joining the room": "Une erreur est survenue en rejoignant le salon",
     "You do not have permission to invite people to this room.": "Vous n'avez pas la permission d'envoyer des invitations dans ce salon.",
     "User %(user_id)s does not exist": "L'utilisateur %(user_id)s n'existe pas",
@@ -968,14 +968,14 @@
     "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "Impossible de trouver les profils pour les identifiants Matrix listés ci-dessous. Voulez-vous quand même les inviter ?",
     "Invite anyway and never warn me again": "Inviter quand même et ne plus me prévenir",
     "Invite anyway": "Inviter quand même",
-    "Whether or not you're logged in (we don't record your username)": "Si vous êtes connecté ou pas (votre nom d'utilisateur n'est pas enregistré)",
+    "Whether or not you're logged in (we don't record your username)": "Si vous êtes connecté ou pas (votre nom d'utilisateur n’est pas enregistré)",
     "Upgrades a room to a new version": "Met à niveau un salon vers une nouvelle version",
     "Sets the room name": "Définit le nom du salon",
     "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s a mis à niveau ce salon.",
     "%(displayName)s is typing …": "%(displayName)s est en train d'écrire…",
-    "%(names)s and %(count)s others are typing …|other": "%(names)s et %(count)s autres sont en train d'écrire…",
-    "%(names)s and %(count)s others are typing …|one": "%(names)s et un autre sont en train d'écrire…",
-    "%(names)s and %(lastPerson)s are typing …": "%(names)s et %(lastPerson)s sont en train d'écrire…",
+    "%(names)s and %(count)s others are typing …|other": "%(names)s et %(count)s autres sont en train d’écrire…",
+    "%(names)s and %(count)s others are typing …|one": "%(names)s et un autre sont en train d’écrire…",
+    "%(names)s and %(lastPerson)s are typing …": "%(names)s et %(lastPerson)s sont en train d’écrire…",
     "Enable Emoji suggestions while typing": "Activer la suggestion d’émojis lors de la saisie",
     "Render simple counters in room header": "Afficher des compteurs simples dans l’en-tête des salons",
     "Show a placeholder for removed messages": "Afficher les messages supprimés",
@@ -1084,7 +1084,7 @@
     "A new recovery passphrase and key for Secure Messages have been detected.": "Un nouveau mot de passe et une nouvelle clé de récupération pour les messages sécurisés ont été détectés.",
     "Recovery Method Removed": "Méthode de récupération supprimée",
     "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Si vous n'avez pas supprimé la méthode de récupération, un attaquant peut être en train d'essayer d'accéder à votre compte. Modifiez le mot de passe de votre compte et configurez une nouvelle méthode de récupération dans les réglages.",
-    "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Le fichier \"%(fileName)s\" dépasse la taille limite autorisée par ce serveur pour les téléchargements",
+    "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Le fichier « %(fileName)s » dépasse la taille limite autorisée par ce serveur pour les envois",
     "Gets or sets the room topic": "Récupère ou définit le sujet du salon",
     "This room has no topic.": "Ce salon n'a pas de sujet.",
     "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s a rendu le salon public à tous ceux qui en connaissent le lien.",
@@ -1092,7 +1092,7 @@
     "%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s a changé la règle d’adhésion en %(rule)s",
     "%(senderDisplayName)s has allowed guests to join the room.": "%(senderDisplayName)s a autorisé les visiteurs à rejoindre le salon.",
     "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)s a empêché les visiteurs de rejoindre le salon.",
-    "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s a changé l'accès des visiteurs en %(rule)s",
+    "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s a changé l’accès des visiteurs en %(rule)s",
     "Group & filter rooms by custom tags (refresh to apply changes)": "Grouper et filtrer les salons grâce à des étiquettes personnalisées (actualiser pour appliquer les changements)",
     "Verify this user by confirming the following emoji appear on their screen.": "Vérifier cet utilisateur en confirmant que les émojis suivant apparaissent sur son écran.",
     "Unable to find a supported verification method.": "Impossible de trouver une méthode de vérification prise en charge.",
@@ -1206,7 +1206,7 @@
     "Create your Matrix account on %(serverName)s": "Créez votre compte Matrix sur %(serverName)s",
     "Could not load user profile": "Impossible de charger le profil de l’utilisateur",
     "Your Matrix account on %(serverName)s": "Votre compte Matrix sur %(serverName)s",
-    "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Ajoute ¯\\_(ツ)_/¯ devant un message en texte brut",
+    "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Ajoute ¯\\_(ツ)_/¯ en préfixe du message",
     "User %(userId)s is already in the room": "L’utilisateur %(userId)s est déjà membre du salon",
     "The user must be unbanned before they can be invited.": "Le bannissement de l’utilisateur doit être révoqué avant de pouvoir l’inviter.",
     "<a>Upgrade</a> to your own domain": "<a>Mettre à niveau</a> vers votre propre domaine",
@@ -1452,7 +1452,7 @@
     "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "Si vous ne voulez pas utiliser <server /> pour découvrir et être découvrable par les contacts que vous connaissez, saisissez un autre serveur d’identité ci-dessous.",
     "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.": "L’utilisation d’un serveur d’identité est optionnelle. Si vous ne choisissez pas d’utiliser un serveur d’identité, les autres utilisateurs ne pourront pas vous découvrir et vous ne pourrez pas en inviter par e-mail ou par téléphone.",
     "Do not use an identity server": "Ne pas utiliser de serveur d’identité",
-    "You do not have the required permissions to use this command.": "Vous n’avez pas les permissions nécessaires pour utiliser cette commande.",
+    "You do not have the required permissions to use this command.": "Vous n’avez pas les autorisations nécessaires pour utiliser cette commande.",
     "Upgrade the room": "Mettre à niveau le salon",
     "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "Renseignez un e-mail pour la récupération de compte. Utilisez un e-mail ou un téléphone pour être éventuellement découvrable par des contacts existants.",
     "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "Renseignez un e-mail pour la récupération de compte. Utilisez un e-mail pour être éventuellement découvrable par des contacts existants.",
@@ -1580,7 +1580,7 @@
     "Unread messages.": "Messages non lus.",
     "Show tray icon and minimize window to it on close": "Afficher l’icône dans la barre d’état et minimiser la fenêtre lors de la fermeture",
     "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.": "Cette action nécessite l’accès au serveur d’identité par défaut <server /> afin de valider une adresse e-mail ou un numéro de téléphone, mais le serveur n’a aucune condition de service.",
-    "Trust": "Confiance",
+    "Trust": "Faire confiance",
     "Message Actions": "Actions de message",
     "%(name)s (%(userId)s)": "%(name)s (%(userId)s)",
     "You verified %(name)s": "Vous avez vérifié %(name)s",
@@ -1665,9 +1665,9 @@
     "Verification Request": "Demande de vérification",
     "Match system theme": "S’adapter au thème du système",
     "%(senderName)s placed a voice call.": "%(senderName)s a passé un appel vocal.",
-    "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s a passé un appel vocal. (pas pris en charge par ce navigateur)",
+    "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s a passé un appel vocal. (non pris en charge par ce navigateur)",
     "%(senderName)s placed a video call.": "%(senderName)s a passé un appel vidéo.",
-    "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s a passé un appel vidéo. (pas pris en charge par ce navigateur)",
+    "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s a passé un appel vidéo. (non pris en charge par ce navigateur)",
     "Clear notifications": "Vider les notifications",
     "Customise your experience with experimental labs features. <a>Learn more</a>.": "Personnalisez votre expérience avec des fonctionnalités expérimentales du labo. <a>En savoir plus</a>.",
     "Error upgrading room": "Erreur lors de la mise à niveau du salon",
@@ -1838,7 +1838,7 @@
     "Unknown (user, session) pair:": "Paire (utilisateur, session) inconnue :",
     "Session already verified!": "Session déjà vérifiée !",
     "WARNING: Session already verified, but keys do NOT MATCH!": "ATTENTION : La session a déjà été vérifiée mais les clés NE CORRESPONDENT PAS !",
-    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "ATTENTION : ÉCHEC DE LA VÉRIFICATION DE CLÉ ! La clé de signature pour %(userId)s et la session %(deviceId)s est « %(fprint)s » que ne correspond pas à la clé fournie « %(fingerprint)s ». Cela pourrait signifier que vos communications sont interceptées !",
+    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "ATTENTION : ÉCHEC DE LA VÉRIFICATION DE CLÉ ! La clé de signature pour %(userId)s et la session %(deviceId)s est « %(fprint)s  ce qui ne correspond pas à la clé fournie « %(fingerprint)s ». Cela pourrait signifier que vos communications sont interceptées !",
     "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "La clé de signature que vous avez fournie correspond à celle que vous avez reçue de la session %(deviceId)s de %(userId)s. Session marquée comme vérifiée.",
     "Never send encrypted messages to unverified sessions from this session": "Ne jamais envoyer de messages chiffrés aux sessions non vérifiées depuis cette session",
     "Never send encrypted messages to unverified sessions in this room from this session": "Ne jamais envoyer des messages chiffrés aux sessions non vérifiées dans ce salon depuis cette session",
@@ -1940,7 +1940,7 @@
     "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) s’est connecté à une nouvelle session sans la vérifier :",
     "Ask this user to verify their session, or manually verify it below.": "Demandez à cet utilisateur de vérifier sa session, ou vérifiez-la manuellement ci-dessous.",
     "Verify by scanning": "Vérifier en scannant",
-    "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Si vous utilisez %(brand)s sur un appareil où le toucher est le mécanisme primaire de saisie",
+    "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Si vous utilisez %(brand)s sur un appareil où le tactile est le mode principal de saisie",
     "Whether you're using %(brand)s as an installed Progressive Web App": "Si vous utilisez %(brand)s en tant qu’application web progressive (PWA)",
     "Your user agent": "Votre agent utilisateur",
     "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what %(brand)s supports. Try with a different client.": "La session que vous essayez de vérifier ne prend pas en charge les codes QR ou la vérification d’émojis, qui sont les méthodes prises en charge par %(brand)s. Essayez avec un autre client.",
@@ -1960,7 +1960,7 @@
     "The internet connection either session is using": "La connection internet de l'une des sessions",
     "We recommend you change your password and recovery key in Settings immediately": "Nous vous recommandons de changer votre mot de passe et la clé de récupération dans Paramètres dès que possible",
     "Sign In or Create Account": "Se connecter ou créer un compte",
-    "Use your account or create a new one to continue.": "Utilisez votre compte ou créez un nouveau compte pour continuer.",
+    "Use your account or create a new one to continue.": "Utilisez votre compte ou créez en un pour continuer.",
     "Create Account": "Créer un compte",
     "Order rooms by name": "Trier les salons par nom",
     "Show rooms with unread notifications first": "Afficher en premier les salons avec des notifications non lues",
@@ -2378,7 +2378,7 @@
     "%(brand)s Desktop": "%(brand)s Desktop",
     "%(brand)s iOS": "%(brand)s iOS",
     "%(brand)s X for Android": "%(brand)s X pour Android",
-    "Are you sure you want to cancel entering passphrase?": "Souhaitez-vous vraiment annuler l'entrée de la phrase de passe ?",
+    "Are you sure you want to cancel entering passphrase?": "Souhaitez-vous vraiment annuler la saisie de la phrase de passe ?",
     "Unexpected server error trying to leave the room": "Erreur de serveur inattendue en essayant de quitter le salon",
     "Error leaving room": "Erreur en essayant de quitter le salon",
     "The person who invited you already left the room.": "La personne vous ayant invité a déjà quitté le salon.",
@@ -2400,18 +2400,18 @@
     "The operation could not be completed": "L'opération n'a pas pu être terminée",
     "Failed to save your profile": "Erreur lors de l'enregistrement du profile",
     "Unknown App": "Application inconnue",
-    "%(senderName)s declined the call.": "%(senderName)s a refusé l'appel.",
+    "%(senderName)s declined the call.": "%(senderName)s a refusé l’appel.",
     "(an error occurred)": "(une erreur est survenue)",
     "(connection failed)": "(échec de connexion)",
-    "%(senderDisplayName)s changed the server ACLs for this room.": "%(senderDisplayName)s a changé les paramètres d'accès du serveur pour ce salon.",
-    "%(senderDisplayName)s set the server ACLs for this room.": "%(senderDisplayName)s a défini les paramètres d'accès du serveur pour ce salon.",
-    "Prepends ( ͡° ͜ʖ ͡°) to a plain-text message": "Ajoute ( ͡° ͜ʖ ͡°) devant un message en texte brut",
+    "%(senderDisplayName)s changed the server ACLs for this room.": "%(senderDisplayName)s a changé les paramètres d’accès du serveur pour ce salon.",
+    "%(senderDisplayName)s set the server ACLs for this room.": "%(senderDisplayName)s a défini les paramètres d’accès du serveur pour ce salon.",
+    "Prepends ( ͡° ͜ʖ ͡°) to a plain-text message": "Ajoute ( ͡° ͜ʖ ͡°) en préfixe du message",
     "This will end the conference for everyone. Continue?": "Ceci arrêtera la téléconférence pour tout le monde. Continuer ?",
     "End conference": "Finir la téléconférence",
-    "The call was answered on another device.": "L'appel a été répondu sur un autre appareil.",
+    "The call was answered on another device.": "L’appel a été répondu sur un autre appareil.",
     "Answered Elsewhere": "Répondu autre-part",
-    "The call could not be established": "L'appel n'a pas pu être établi",
-    "The other party declined the call.": "L'autre personne a décliné l'appel.",
+    "The call could not be established": "L’appel n’a pas pu être établi",
+    "The other party declined the call.": "Le correspondant a décliné l’appel.",
     "Call Declined": "Appel rejeté",
     "Ignored attempt to disable encryption": "Essai de désactiver le chiffrement ignoré",
     "Add users and servers you want to ignore here. Use asterisks to have %(brand)s match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.": "Ajoutez les utilisateurs et les serveurs que vous voulez ignorer ici. Utilisez des astérisques pour que %(brand)s comprenne tous les caractères. Par exemple, <code>@bot:*</code> va ignorer tous les utilisateurs ayant le nom 'bot' sur n'importe quel serveur.",
@@ -2428,8 +2428,8 @@
     "Offline encrypted messaging using dehydrated devices": "Messagerie hors-ligne chiffrée utilisant des appareils déshydratés",
     "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.": "Prototype de communautés v2. Requiert un serveur d'accueil compatible. Très expérimental - à utiliser avec précaution.",
     "Safeguard against losing access to encrypted messages & data": "Sécurité contre la perte d'accès aux messages & données chiffrées",
-    "(their device couldn't start the camera / microphone)": "(son appareil ne peut pas démarrer la caméra / le microphone)",
-    "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 Tous les serveurs sont interdits de participation ! Ce salon ne peut plus être utilisé.",
+    "(their device couldn't start the camera / microphone)": "(leur appareil ne peut pas démarrer la caméra/le microphone)",
+    "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 Tous les serveurs ont été bannis ! Ce salon ne peut plus être utilisé.",
     "What's the name of your community or team?": "Quel est le nom de votre communauté ou équipe ?",
     "You can change this later if needed.": "Vous pouvez modifier ceci après si besoin.",
     "Use this when referencing your community to others. The community ID cannot be changed.": "Utilisez ceci lorsque vous faites référence à votre communauté aux autres. L'identifiant de la communauté ne peut pas être modifié.",
@@ -2570,12 +2570,12 @@
     "Afghanistan": "Afghanistan",
     "United States": "États-Unis",
     "United Kingdom": "Royaume-Uni",
-    "You've reached the maximum number of simultaneous calls.": "Vous avez atteint le nombre maximum d'appels en simultané.",
-    "No other application is using the webcam": "Aucune autre application n'est en train d'utiliser la caméra",
-    "A microphone and webcam are plugged in and set up correctly": "Un microphone et une caméra sont branchées et bien configurées",
-    "Unable to access webcam / microphone": "Impossible d'accéder à la caméra ou microphone",
-    "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "La fonction a échoué car le microphone n'a pas pu être accédé. Vérifiez qu'un microphone est branché et bien configuré.",
-    "Unable to access microphone": "Impossible d'accéder au microphone",
+    "You've reached the maximum number of simultaneous calls.": "Vous avez atteint le nombre maximum d’appels en simultané.",
+    "No other application is using the webcam": "Aucune autre application n’est en train d’utiliser la caméra",
+    "A microphone and webcam are plugged in and set up correctly": "Un microphone et une caméra sont branchées et bien configurés",
+    "Unable to access webcam / microphone": "Impossible d’accéder à la caméra ou au microphone",
+    "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "La fonction a échoué faute de pouvoir accéder au microphone. Vérifiez qu’un microphone est branché et bien configuré.",
+    "Unable to access microphone": "Impossible d’accéder au microphone",
     "Belgium": "Belgique",
     "Belarus": "Biélorussie",
     "Barbados": "Barbade",
@@ -2591,15 +2591,15 @@
     "Antigua & Barbuda": "Antigue-et-Barbude",
     "Antarctica": "Antarctique",
     "Anguilla": "Anguilla",
-    "Angola": "République d'Angola",
+    "Angola": "République d’Angola",
     "Andorra": "Andorre",
     "American Samoa": "Samoa américaines",
     "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.": "Invitez quelqu'un via leur nom, e-mail ou nom d'utilisateur (p. ex. <userId/>) ou <a>partagez ce salon</a>.",
     "Start a conversation with someone using their name, email address or username (like <userId/>).": "Commencer une conversation avec quelqu'un via leur nom, e-mail ou nom d'utilisateur (comme par exemple <userId/>).",
-    "Too Many Calls": "Trop d'appels",
-    "Permission is granted to use the webcam": "Permission accordée pour l'utilisation de la webcam",
-    "Call failed because webcam or microphone could not be accessed. Check that:": "La fonction a échoué car la webcam ou le microphone ne pouvait pas être accédé. Vérifiez que :",
-    "Send stickers to this room as you": "Envoyer des stickers dans ce salon en tant que vous",
+    "Too Many Calls": "Trop d’appels",
+    "Permission is granted to use the webcam": "L’autorisation d’accéder à la caméra a été accordée",
+    "Call failed because webcam or microphone could not be accessed. Check that:": "La fonction a échoué faute de pouvoir accéder à la caméra ou au microphone. Vérifiez que :",
+    "Send stickers to this room as you": "Envoyer des stickers dans ce salon en tant que vous-même",
     "Zambia": "Zambie",
     "Yemen": "Yémen",
     "Western Sahara": "Sahara occidental",
@@ -2685,7 +2685,7 @@
     "North Korea": "Corée du Nord",
     "Norfolk Island": "Île Norfolk",
     "Niue": "Niue",
-    "Nigeria": "Nigéria",
+    "Nigeria": "Nigeria",
     "Niger": "Niger",
     "Nicaragua": "Nicaragua",
     "New Zealand": "Nouvelle-Zélande",
@@ -2703,7 +2703,7 @@
     "Monaco": "Monaco",
     "Moldova": "Moldavie",
     "Micronesia": "États fédérés de Micronésie",
-    "Mexico": "Mexico",
+    "Mexico": "Mexique",
     "Mayotte": "Mayotte",
     "Mauritius": "République de Maurice",
     "Mauritania": "Mauritanie",
@@ -2783,13 +2783,13 @@
     "Equatorial Guinea": "Guinée équatoriale",
     "El Salvador": "Le Salvador",
     "Egypt": "Égypte",
-    "Ecuador": "République de l'Équateur",
+    "Ecuador": "République de l’Équateur",
     "Dominican Republic": "République dominicaine",
     "Dominica": "Dominique",
     "Djibouti": "Djibouti",
     "Denmark": "Danemark",
-    "Côte d’Ivoire": "Côte d’Ivoire (Terre d'Éburnie)",
-    "Czech Republic": "La République tchèque",
+    "Côte d’Ivoire": "Côte d’Ivoire",
+    "Czech Republic": "République tchèque",
     "Cyprus": "Chypre",
     "Curaçao": "Curaçao",
     "Cuba": "Cuba",
@@ -2799,7 +2799,7 @@
     "Congo - Kinshasa": "République démocratique du Congo",
     "Congo - Brazzaville": "République du Congo",
     "Comoros": "Comores",
-    "Colombia": "Colombia",
+    "Colombia": "Colombie",
     "Cocos (Keeling) Islands": "îles Cocos",
     "Christmas Island": "île Christmas",
     "China": "Chine",
@@ -2812,12 +2812,12 @@
     "Canada": "Canada",
     "Cameroon": "Cameroun",
     "Cambodia": "Cambodge",
-    "Burundi": "La république du Burundi",
+    "Burundi": "République du Burundi",
     "Burkina Faso": "Burkina Faso",
     "Bulgaria": "Bulgarie",
     "Brunei": "Brunéi",
     "British Virgin Islands": "Îles Vierges britanniques",
-    "British Indian Ocean Territory": "Territoire britannique de l'océan Indien",
+    "British Indian Ocean Territory": "Territoire britannique de l’océan Indien",
     "Brazil": "Brésil",
     "Bouvet Island": "Île Bouvet",
     "Botswana": "Botswana",
@@ -2825,14 +2825,14 @@
     "Bolivia": "Bolivie",
     "Bhutan": "Bhoutan",
     "Bermuda": "Bermudes",
-    "with state key %(stateKey)s": "avec la ou les clés d'état %(stateKey)s",
-    "with an empty state key": "avec une clé d'état vide",
-    "See when anyone posts a sticker to your active room": "Voir quand n'importe qui envoye un sticker dans le salon actuel",
+    "with state key %(stateKey)s": "avec la ou les clés d’état %(stateKey)s",
+    "with an empty state key": "avec une clé d’état vide",
+    "See when anyone posts a sticker to your active room": "Voir quand n’importe qui envoie un sticker dans le salon actuel",
     "See when a sticker is posted in this room": "Voir quand un sticker est envoyé dans ce salon",
-    "See when the avatar changes in your active room": "Voir quand l'avatar change dans le salon actuel",
-    "Change the avatar of your active room": "Changer l'avatar du salon actuel",
-    "See when the avatar changes in this room": "Voir quand l'avatar change dans ce salon",
-    "Change the avatar of this room": "Changer l'avatar de ce salon",
+    "See when the avatar changes in your active room": "Voir quand l’avatar change dans le salon actuel",
+    "Change the avatar of your active room": "Changer l’avatar du salon actuel",
+    "See when the avatar changes in this room": "Voir quand l’avatar change dans ce salon",
+    "Change the avatar of this room": "Changer l’avatar de ce salon",
     "Send stickers into your active room": "Envoyer des stickers dans le salon actuel",
     "See when the topic changes in this room": "Voir quand le sujet change dans ce salon",
     "See when the topic changes in your active room": "Voir quand le sujet change dans le salon actuel",
@@ -2842,35 +2842,35 @@
     "Change the topic of your active room": "Changer le sujet dans le salon actuel",
     "Change the topic of this room": "Changer le sujet de ce salon",
     "Send stickers into this room": "Envoyer des stickers dans ce salon",
-    "Remain on your screen when viewing another room, when running": "Reste sur votre écran quand vous regardez un autre salon lors de l'appel",
-    "Takes the call in the current room off hold": "Reprends l'appel en cours dans ce salon",
-    "Places the call in the current room on hold": "Met l'appel en pause dans ce salon",
-    "Prepends (╯°□°）╯︵ ┻━┻ to a plain-text message": "Ajoute \"(╯°□°）╯︵ ┻━┻\" en préfixe du message",
-    "Prepends ┬──┬ ノ( ゜-゜ノ) to a plain-text message": "Ajoute \"┬──┬ ノ( ゜-゜ノ)\" en préfixe du message",
+    "Remain on your screen when viewing another room, when running": "Reste sur votre écran quand vous regardez un autre salon lors de l’appel",
+    "Takes the call in the current room off hold": "Reprend l’appel en cours dans ce salon",
+    "Places the call in the current room on hold": "Met l’appel en pause dans ce salon",
+    "Prepends (╯°□°）╯︵ ┻━┻ to a plain-text message": "Ajoute (╯°□°）╯︵ ┻━┻ en préfixe du message",
+    "Prepends ┬──┬ ノ( ゜-゜ノ) to a plain-text message": "Ajoute ┬──┬ ノ( ゜-゜ノ) en préfixe du message",
     "Effects": "Effets",
     "Zimbabwe": "Zimbabwe",
     "Send images as you in your active room": "Envoie des images sous votre nom dans le salon actuel",
     "Send images as you in this room": "Envoie des images sous votre nom dans ce salon",
-    "See emotes posted to your active room": "Voir les émoticônes envoyées dans le salon actuel",
-    "See emotes posted to this room": "Voir les émoticônes envoyées dans ce salon",
-    "Send emotes as you in your active room": "Envoyer des émoticônes sous votre nom dans le salon actuel",
-    "Send emotes as you in this room": "Envoyer des émoticônes sous votre nom dans ce salon",
-    "See videos posted to your active room": "Voir les vidéos publiées dans votre salon actuel",
+    "See emotes posted to your active room": "Voir les réactions envoyées dans le salon actuel",
+    "See emotes posted to this room": "Voir les réactions envoyées dans ce salon",
+    "Send emotes as you in your active room": "Envoyer des réactions sous votre nom dans le salon actuel",
+    "Send emotes as you in this room": "Envoyer des réactions sous votre nom dans ce salon",
+    "See videos posted to your active room": "Voir les vidéos publiées dans votre salon actif",
     "See videos posted to this room": "Voir les vidéos publiées dans ce salon",
-    "Send videos as you in your active room": "Envoie des vidéos en tant que vous dans votre salon actuel",
+    "Send videos as you in your active room": "Envoie des vidéos en tant que vous-même dans votre salon actuel",
     "Send videos as you in this room": "Envoie des vidéos en tant que vous dans ce salon",
     "See images posted to this room": "Voir les images publiées dans ce salon",
-    "See images posted to your active room": "Voir les images publiées dans votre salon actuel",
-    "See messages posted to your active room": "Voir les messages publiés dans votre salon actuel",
+    "See images posted to your active room": "Voir les images publiées dans votre salon actif",
+    "See messages posted to your active room": "Voir les messages publiés dans votre salon actif",
     "See messages posted to this room": "Voir les messages publiés dans ce salon",
-    "Send messages as you in your active room": "Envoie des messages en tant que vous dans votre salon actuel",
-    "Send messages as you in this room": "Envoie des messages en tant que vous dans ce salon",
+    "Send messages as you in your active room": "Envoie des messages en tant que vous-même dans votre salon actif",
+    "Send messages as you in this room": "Envoie des messages en tant que vous-même dans ce salon",
     "The <b>%(capability)s</b> capability": "La capacité <b>%(capability)s</b>",
     "See <b>%(eventType)s</b> events posted to your active room": "Voir les événements <b>%(eventType)s</b> publiés dans votre salon actuel",
-    "Send <b>%(eventType)s</b> events as you in your active room": "Envoie des événements <b>%(eventType)s</b> en tant que vous dans votre salon actuel",
+    "Send <b>%(eventType)s</b> events as you in your active room": "Envoie des événements <b>%(eventType)s</b> en tant que vous-même dans votre salon actuel",
     "See <b>%(eventType)s</b> events posted to this room": "Voir les événements <b>%(eventType)s</b> publiés dans ce salon",
-    "Send <b>%(eventType)s</b> events as you in this room": "Envoie des événements <b>%(eventType)s</b> en tant que vous dans ce salon",
-    "Send stickers to your active room as you": "Envoie des stickers en tant que vous dans le salon actuel",
+    "Send <b>%(eventType)s</b> events as you in this room": "Envoie des événements <b>%(eventType)s</b> en tant que vous-même dans ce salon",
+    "Send stickers to your active room as you": "Envoie des stickers en tant que vous-même dans le salon actuel",
     "Continue with %(ssoButtons)s": "Continuer avec %(ssoButtons)s",
     "About homeservers": "À propos des serveurs d'accueils",
     "Learn more": "En savoir plus",
@@ -2930,12 +2930,12 @@
     "Don't miss a reply": "Ne ratez pas une réponse",
     "See <b>%(msgtype)s</b> messages posted to your active room": "Voir les messages de type <b>%(msgtype)s</b> publiés dans le salon actuel",
     "See <b>%(msgtype)s</b> messages posted to this room": "Voir les messages de type <b>%(msgtype)s</b> publiés dans ce salon",
-    "Send <b>%(msgtype)s</b> messages as you in this room": "Envoie des messages de type<b>%(msgtype)s</b> en tant que vous dans ce salon",
-    "Send <b>%(msgtype)s</b> messages as you in your active room": "Envoie des messages de type <b>%(msgtype)s</b> en tant que vous dans votre salon actuel",
+    "Send <b>%(msgtype)s</b> messages as you in this room": "Envoie des messages de type<b>%(msgtype)s</b> en tant que vous-même dans ce salon",
+    "Send <b>%(msgtype)s</b> messages as you in your active room": "Envoie des messages de type <b>%(msgtype)s</b> en tant que vous-même dans votre salon actif",
     "See general files posted to your active room": "Voir les fichiers postés dans votre salon actuel",
     "See general files posted to this room": "Voir les fichiers postés dans ce salon",
-    "Send general files as you in your active room": "Envoie des fichiers en tant que vous dans votre salon actuel",
-    "Send general files as you in this room": "Envoie des fichiers en tant que vous dans ce salon",
+    "Send general files as you in your active room": "Envoyer des fichiers en tant que vous-même dans votre salon actif",
+    "Send general files as you in this room": "Envoyer des fichiers en tant que vous-même dans ce salon",
     "Search (must be enabled)": "Recherche (si activée)",
     "This session has detected that your Security Phrase and key for Secure Messages have been removed.": "Cette session a détecté que votre phrase de passe et clé de sécurité pour les messages sécurisés ont été supprimées.",
     "A new Security Phrase and key for Secure Messages have been detected.": "Une nouvelle phrase de passe et clé pour les messages sécurisés ont été détectées.",
@@ -3035,10 +3035,10 @@
     "See when the name changes in your active room": "Suivre les changements de nom dans le salon actif",
     "Change which room, message, or user you're viewing": "Changer le salon, message, ou la personne que vous visualisez",
     "Change which room you're viewing": "Changer le salon que vous visualisez",
-    "Remain on your screen while running": "Restez sur votre écran pendant l’exécution",
+    "Remain on your screen while running": "Reste sur votre écran pendant l’exécution",
     "%(senderName)s has updated the widget layout": "%(senderName)s a mis à jour la disposition du widget",
-    "Converts the DM to a room": "Transformer le message privé en salon",
-    "Converts the room to a DM": "Transformer le salon en message privé",
+    "Converts the DM to a room": "Transforme le message privé en salon",
+    "Converts the room to a DM": "Transforme le salon en message privé",
     "Your homeserver rejected your log in attempt. This could be due to things just taking too long. Please try again. If this continues, please contact your homeserver administrator.": "Votre serveur d’accueil a rejeté la demande de connexion. Ceci pourrait être dû à une connexion qui prend trop de temps. Si cela persiste, merci de contacter l’administrateur de votre serveur d’accueil.",
     "Your homeserver was unreachable and was not able to log you in. Please try again. If this continues, please contact your homeserver administrator.": "Votre serveur d’accueil n’est pas accessible, nous n’avons pas pu vous connecter. Merci de réessayer. Si cela persiste, merci de contacter l’administrateur de votre serveur d’accueil.",
     "Try again": "Réessayez",

From 83d10b827b0f75decc8959adb7c833fee5406afe Mon Sep 17 00:00:00 2001
From: Jean-Luc KABORE-TURQUIN <turquinjl@gmail.com>
Date: Thu, 25 Feb 2021 08:15:23 +0000
Subject: [PATCH 095/420] Translated using Weblate (French)

Currently translated at 99.2% (2758 of 2780 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-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 304599cd44..3d024f6e18 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -77,7 +77,7 @@
     "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": "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",
+    "Failure to create room": "Échec de création du salon",
     "Favourites": "Favoris",
     "Fill screen": "Plein écran",
     "Filter room members": "Filtrer les membres du salon",

From f75d98493d0fba3883cf355746d63e2ee6df6bba Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Wed, 24 Feb 2021 21:44:12 +0000
Subject: [PATCH 096/420] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2780 of 2780 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
---
 src/i18n/strings/hu.json | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 398dd04ec2..d0f8cc3b69 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -3060,5 +3060,27 @@
     "Failed to connect to your homeserver. Please close this dialog and try again.": "A matrix szerverhez való csatlakozás nem sikerült. Zárja be ezt az ablakot és próbálja újra.",
     "Abort": "Megszakítás",
     "Are you sure you wish to abort creation of the host? The process cannot be continued.": "Biztos benne, hogy meg kívánja szakítani a gazdagép létrehozásának a folyamatát? A folyamat nem folytatható.",
-    "Confirm abort of host creation": "Erősítse meg a gazdagép készítés megszakítását"
+    "Confirm abort of host creation": "Erősítse meg a gazdagép készítés megszakítását",
+    "Upgrade to %(hostSignupBrand)s": "Frissítés erre: %(hostSignupBrand)s",
+    "Edit Values": "Értékek szerkesztése",
+    "Values at explicit levels in this room:": "Egyedi szinthez tartozó értékek ebben a szobában:",
+    "Values at explicit levels:": "Egyedi szinthez tartozó értékek:",
+    "Value in this room:": "Érték ebben a szobában:",
+    "Value:": "Érték:",
+    "Save setting values": "Beállított értékek mentése",
+    "Values at explicit levels in this room": "Egyedi szinthez tartozó értékek ebben a szobában",
+    "Values at explicit levels": "Egyedi szinthez tartozó értékek",
+    "Settable at room": "Szobára beállítható",
+    "Settable at global": "Általánosan beállítható",
+    "Level": "Szint",
+    "Setting definition:": "Beállítás leírása:",
+    "This UI does NOT check the types of the values. Use at your own risk.": "Ez a felület nem ellenőrzi az érték típusát. Csak saját felelősségére használja.",
+    "Caution:": "Figyelmeztetés:",
+    "Setting:": "Beállítás:",
+    "Value in this room": "Érték ebben a szobában",
+    "Value": "Érték",
+    "Setting ID": "Beállítás azon.",
+    "Failed to save settings": "A beállítások elmentése nem sikerült",
+    "Settings Explorer": "Beállítás Böngésző",
+    "Show chat effects (animations when receiving e.g. confetti)": "Csevegés effektek megjelenítése (mint a konfetti animáció)"
 }

From 32ac7d7c8b98e26872bef1b707d05187d89405f4 Mon Sep 17 00:00:00 2001
From: jelv <post@jelv.nl>
Date: Thu, 25 Feb 2021 13:56:38 +0000
Subject: [PATCH 097/420] Translated using Weblate (Dutch)

Currently translated at 100.0% (2780 of 2780 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
---
 src/i18n/strings/nl.json | 44 ++++++++++++++++++++++++++++++----------
 1 file changed, 33 insertions(+), 11 deletions(-)

diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 101d997d9c..0d80e520c8 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -689,7 +689,7 @@
     "Messages in one-to-one chats": "Berichten in één-op-één gesprekken",
     "Unavailable": "Niet beschikbaar",
     "View Decrypted Source": "Ontsleutelde bron bekijken",
-    "Failed to update keywords": "Bijwerken van trefwoorden is mislukt",
+    "Failed to update keywords": "Updaten van trefwoorden is mislukt",
     "remove %(name)s from the directory.": "verwijder %(name)s uit de catalogus.",
     "Notifications on the following keywords follow rules which can’t be displayed here:": "Meldingen op de volgende trefwoorden volgen regels die hier niet getoond kunnen worden:",
     "Please set a password!": "Stel een wachtwoord in!",
@@ -740,7 +740,7 @@
     "What's new?": "Wat is er nieuw?",
     "Notify me for anything else": "Stuur een melding voor al het andere",
     "When I'm invited to a room": "Wanneer ik uitgenodigd word in een gesprek",
-    "Can't update user notification settings": "Kan de meldingsinstellingen van de gebruiker niet bijwerken",
+    "Can't update user notification settings": "Kan de meldingsinstellingen van de gebruiker niet updaten",
     "Notify for all other messages/rooms": "Stuur een melding voor alle andere berichten/gesprekken",
     "Unable to look up room ID from server": "Kon de gesprek-ID niet van de server ophalen",
     "Couldn't find a matching Matrix room": "Kon geen bijbehorend Matrix-gesprek vinden",
@@ -852,7 +852,7 @@
     "Gets or sets the room topic": "Verkrijgt het onderwerp van het gesprek of stelt het in",
     "This room has no topic.": "Dit gesprek heeft geen onderwerp.",
     "Sets the room name": "Stelt de gespreksnaam in",
-    "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s heeft dit gesprek bijgewerkt.",
+    "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s heeft dit gesprek geüpgraded.",
     "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s heeft het gesprek toegankelijk gemaakt voor iedereen die de koppeling kent.",
     "%(senderDisplayName)s made the room invite only.": "%(senderDisplayName)s heeft het gesprek enkel op uitnodiging toegankelijk gemaakt.",
     "%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s heeft de toegangsregel veranderd naar ‘%(rule)s’",
@@ -1240,7 +1240,7 @@
     "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s heeft de uitnodiging aan %(targetDisplayName)s toe te treden tot het gesprek ingetrokken.",
     "Upgrade this room to the recommended room version": "Werk dit gesprek bij tot de aanbevolen versie",
     "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "Dit gesprek draait op groepsgespreksversie <roomVersion />, die door deze homeserver als <i>onstabiel</i> is gemarkeerd.",
-    "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Bijwerken zal de huidige versie van dit gesprek sluiten, en onder dezelfde naam een bijgewerkte versie starten.",
+    "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Upgraden zal de huidige versie van dit gesprek sluiten, en onder dezelfde naam een geüpgraded versie starten.",
     "Failed to revoke invite": "Intrekken van uitnodiging is mislukt",
     "Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.": "Kon de uitnodiging niet intrekken. De server ondervindt mogelijk een tijdelijk probleem, of u heeft niet het recht de uitnodiging in te trekken.",
     "Revoke invite": "Uitnodiging intrekken",
@@ -1289,7 +1289,7 @@
     "Unexpected error resolving homeserver configuration": "Onverwachte fout bij het controleren van de homeserverconfiguratie",
     "The user's homeserver does not support the version of the room.": "De homeserver van de gebruiker biedt geen ondersteuning voor de gespreksversie.",
     "Show hidden events in timeline": "Verborgen gebeurtenissen op de tijdslijn weergeven",
-    "When rooms are upgraded": "Wanneer gesprekken bijgewerkt worden",
+    "When rooms are upgraded": "Wanneer gesprekken geüpgraded worden",
     "this room": "dit gesprek",
     "View older messages in %(roomName)s.": "Bekijk oudere berichten in %(roomName)s.",
     "Joining room …": "Deelnemen aan gesprek…",
@@ -1316,7 +1316,7 @@
     "This room doesn't exist. Are you sure you're at the right place?": "Dit gesprek bestaat niet. Weet u zeker dat u zich op de juiste plaats bevindt?",
     "Try again later, or ask a room admin to check if you have access.": "Probeer het later opnieuw, of vraag een gespreksbeheerder om te controleren of u wel toegang heeft.",
     "%(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>.": "De foutcode %(errcode)s is weergegeven bij het toetreden van het gesprek. Als u meent dat u dit bericht foutief te zien krijgt, gelieve dan <issueLink>een foutmelding in te dienen</issueLink>.",
-    "This room has already been upgraded.": "Dit gesprek is reeds bijgewerkt.",
+    "This room has already been upgraded.": "Dit gesprek is reeds geüpgraded.",
     "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith>heeft gereageerd met %(shortName)s</reactedWith>",
     "edited": "bewerkt",
     "Rotate Left": "Links draaien",
@@ -1557,7 +1557,7 @@
     "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "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",
+    "Error upgrading room": "Upgraden van gesprek mislukt",
     "Double check that your server supports the room version chosen and try again.": "Ga nogmaals na dat de server de gekozen gespreksversie ondersteunt, en probeer het dan opnieuw.",
     "Verifies a user, session, and pubkey tuple": "Verifieert een combinatie van gebruiker+sessie+publieke sleutel",
     "Unknown (user, session) pair:": "Onbekende combinatie gebruiker+sessie:",
@@ -1618,7 +1618,7 @@
     "Lock": "Hangslot",
     "Verify yourself & others to keep your chats safe": "Verifieer uzelf en anderen om uw gesprekken veilig te houden",
     "Other users may not trust it": "Mogelijk wantrouwen anderen het",
-    "Upgrade": "Bijwerken",
+    "Upgrade": "Upgraden",
     "Verify": "Verifiëren",
     "Later": "Later",
     "Review": "Controle",
@@ -2377,7 +2377,7 @@
     "Use between %(min)s pt and %(max)s pt": "Gebruik een getal tussen %(min)s pt en %(max)s pt",
     "Custom font size can only be between %(min)s pt and %(max)s pt": "Aangepaste lettergrootte kan alleen een getal tussen %(min)s pt en %(max)s pt zijn",
     "Size must be a number": "Grootte moet een getal zijn",
-    "New version available. <a>Update now.</a>": "Nieuwe versie beschikbaar. <a>Nu bijwerken.</a>",
+    "New version available. <a>Update now.</a>": "Nieuwe versie beschikbaar. <a>Nu updaten.</a>",
     "not ready": "Niet gereed",
     "ready": "Gereed",
     "unexpected type": "Onverwacht type",
@@ -2445,7 +2445,7 @@
     "The person who invited you already left the room, or their server is offline.": "De persoon door wie u ben uitgenodigd heeft het gesprek al verlaten, of hun server is offline.",
     "The person who invited you already left the room.": "De persoon door wie u ben uitgenodigd, heeft het gesprek reeds verlaten.",
     "New version of %(brand)s is available": "Nieuwe versie van %(brand)s is beschikbaar",
-    "Update %(brand)s": "%(brand)s bijwerken",
+    "Update %(brand)s": "%(brand)s updaten",
     "%(senderName)s has updated the widget layout": "%(senderName)s heeft de widget-indeling bijgewerkt",
     "%(senderName)s declined the call.": "%(senderName)s heeft de oproep afgewezen.",
     "(an error occurred)": "(een fout is opgetreden)",
@@ -2950,5 +2950,27 @@
     "Create a Group Chat": "Maak een groepsgesprek aan",
     "Send a Direct Message": "Start een direct gesprek",
     "Welcome to %(appName)s": "Welkom bij %(appName)s",
-    "<a>Add a topic</a> to help people know what it is about.": "<a>Stel een gespreksonderwerp in</a> zodat mensen weten waar het over gaat."
+    "<a>Add a topic</a> to help people know what it is about.": "<a>Stel een gespreksonderwerp in</a> zodat mensen weten waar het over gaat.",
+    "Upgrade to %(hostSignupBrand)s": "Upgrade naar %(hostSignupBrand)s",
+    "Edit Values": "Waarde wijzigen",
+    "Values at explicit levels in this room:": "Waarde op expliciete niveaus in dit gesprek:",
+    "Values at explicit levels:": "Waardes op expliciete niveaus:",
+    "Value in this room:": "Waarde in dit gesprek:",
+    "Value:": "Waarde:",
+    "Save setting values": "Instelling waardes opslaan",
+    "Values at explicit levels in this room": "Waardes op expliciete niveaus in dit gesprek",
+    "Values at explicit levels": "Waardes op expliciete niveaus",
+    "Settable at room": "Instelbaar op gesprek",
+    "Settable at global": "Instelbaar op globaal",
+    "Level": "Niveau",
+    "Setting definition:": "Instelling definitie:",
+    "This UI does NOT check the types of the values. Use at your own risk.": "De UI heeft GEEN controle op het type van de waardes. Gebruik op eigen risico.",
+    "Caution:": "Opgelet:",
+    "Setting:": "Instelling:",
+    "Value in this room": "Waarde van dit gesprek",
+    "Value": "Waarde",
+    "Setting ID": "Instellingen-ID",
+    "Failed to save settings": "Kan geen instellingen opslaan",
+    "Settings Explorer": "Instellingen Ontdekken",
+    "Show chat effects (animations when receiving e.g. confetti)": "Effecten tonen (animaties bij ontvangst bijv. confetti)"
 }

From abbe51660438ad2baa92d88097a2c1f926ab71b9 Mon Sep 17 00:00:00 2001
From: Marcelo Filho <marceloaof@protonmail.com>
Date: Fri, 26 Feb 2021 17:32:14 +0000
Subject: [PATCH 098/420] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (2780 of 2780 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/pt_BR/
---
 src/i18n/strings/pt_BR.json | 38 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index b32fbf5094..ef748c5fd8 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -2983,5 +2983,41 @@
     "Converts the DM to a room": "Converte a conversa para uma sala",
     "Converts the room to a DM": "Converte a sala para uma conversa",
     "Try again": "Tente novamente",
-    "We couldn't log you in": "Não foi possível fazer login"
+    "We couldn't log you in": "Não foi possível fazer login",
+    "%(hostSignupBrand)s Setup": "Configuração do %(hostSignupBrand)s",
+    "Continuing temporarily allows the %(hostSignupBrand)s setup process to access your account to fetch verified email addresses. This data is not stored.": "Ao continuar, você permite que o processo de configuração do %(hostSignupBrand)s acesse a sua conta para obter endereços de e-mail verificados, temporariamente. Esses dados não são armazenados.",
+    "Settable at room": "Definido em cada sala",
+    "Settable at global": "Definido globalmente",
+    "Settings Explorer": "Explorador de configurações",
+    "Level": "Nível",
+    "Setting definition:": "Definição da configuração:",
+    "Setting ID": "ID da configuração",
+    "Your homeserver rejected your log in attempt. This could be due to things just taking too long. Please try again. If this continues, please contact your homeserver administrator.": "Seu servidor local recusou a sua tentativa de login. Isso pode ocorrer quando a conexão de internet estiver demorando muito. Por favor, tente novamente. Se o problema continuar, entre em contato com o administrador do seu servidor local.",
+    "Your homeserver was unreachable and was not able to log you in. Please try again. If this continues, please contact your homeserver administrator.": "O seu servidor local está inacessível e não foi possível fazer o seu login. Tente novamente. Se o problema continuar, entre em contato com o administrador do seu servidor local.",
+    "We asked the browser to remember which homeserver you use to let you sign in, but unfortunately your browser has forgotten it. Go to the sign in page and try again.": "Anteriormente, pedimos ao seu navegador para lembrar qual servidor local você usa para fazer login, mas infelizmente o navegador se esqueceu disso. Vá para a página de login e tente novamente.",
+    "Upgrade to %(hostSignupBrand)s": "Atualizar para %(hostSignupBrand)s",
+    "Minimize dialog": "Minimizar a janela",
+    "Maximize dialog": "Maximizar a janela",
+    "You should know": "Você deveria saber",
+    "Cookie Policy": "Política de cookies",
+    "Failed to connect to your homeserver. Please close this dialog and try again.": "Falha ao se conectar ao seu servidor local. Feche esta caixa de diálogo e tente novamente.",
+    "Abort": "Cancelar",
+    "Are you sure you wish to abort creation of the host? The process cannot be continued.": "Tem certeza de que deseja cancelar a criação do host? O processo não pode ser continuado.",
+    "Confirm abort of host creation": "Confirmar o cancelamento da criação do host",
+    "Edit Values": "Editar valores",
+    "Values at explicit levels in this room:": "Valores em níveis explícitos nessa sala:",
+    "Values at explicit levels:": "Valores em níveis explícitos:",
+    "Value in this room:": "Valor nessa sala:",
+    "Value:": "Valor:",
+    "Save setting values": "Salvar valores de configuração",
+    "Values at explicit levels in this room": "Valores em níveis explícitos nessa sala",
+    "Values at explicit levels": "Valores em níveis explícitos",
+    "This UI does NOT check the types of the values. Use at your own risk.": "Esta interface de usuário NÃO verifica os tipos de valores. Use por sua conta e risco.",
+    "Caution:": "Atenção:",
+    "Setting:": "Configuração:",
+    "Value in this room": "Valor nessa sala",
+    "Value": "Valor",
+    "Failed to save settings": "Falha ao salvar as configurações",
+    "Show chat effects (animations when receiving e.g. confetti)": "Mostrar efeitos na conversa (por exemplo: animações ao receber confetes)",
+    "Element Web is experimental on mobile. For a better experience and the latest features, use our free native app.": "O Element Web é experimental para dispositivos móveis. Para uma melhor experiência e os recursos mais recentes, use nosso aplicativo gratuito."
 }

From 3540bec046cc648f97699967439d81b1c5ed2027 Mon Sep 17 00:00:00 2001
From: rkfg <rkfg@rkfg.me>
Date: Sat, 27 Feb 2021 11:02:52 +0000
Subject: [PATCH 099/420] Translated using Weblate (Russian)

Currently translated at 99.6% (2769 of 2780 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ru/
---
 src/i18n/strings/ru.json | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 65aeaf82d9..8310676e69 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1591,7 +1591,7 @@
     "Error upgrading room": "Ошибка обновления комнаты",
     "Match system theme": "Тема системы",
     "Show tray icon and minimize window to it on close": "Показать иконку в трее и сворачивать окно при закрытии",
-    "Show typing notifications": "Показывать уведомления о наборе",
+    "Show typing notifications": "Показывать уведомления о наборе текста",
     "Delete %(count)s sessions|other": "Удалить %(count)s сессий",
     "Enable desktop notifications for this session": "Включить уведомления для рабочего стола для этой сессии",
     "Enable audible notifications for this session": "Включить звуковые уведомления для этой сессии",
@@ -3031,7 +3031,7 @@
     "Privacy Policy": "Политика конфиденциальности",
     "Cookie Policy": "Политика использования файлов cookie",
     "Learn more in our <privacyPolicyLink />, <termsOfServiceLink /> and <cookiePolicyLink />.": "Дополнительную информацию можно найти на страницах <privacyPolicyLink />,<termsOfServiceLink /> и <cookiePolicyLink />.",
-    "Continuing temporarily allows the %(hostSignupBrand)s setup process to access your account to fetch verified email addresses. This data is not stored.": "Продолжая процесс настройки %(hostSignupBrand)s, вы предоставите доступ к вашей учётной записи для получения проверенных адресов электронной почты. Эти данные не сохраняются.",
+    "Continuing temporarily allows the %(hostSignupBrand)s setup process to access your account to fetch verified email addresses. This data is not stored.": "Продолжая процесс настройки %(hostSignupBrand)s, вы предоставите временный доступ к вашей учётной записи для получения проверенных адресов электронной почты. Эти данные не сохраняются.",
     "Failed to connect to your homeserver. Please close this dialog and try again.": "Не удалось подключиться к домашнему серверу. Закройте это диалоговое окно и попробуйте ещё раз.",
     "Abort": "Отмена",
     "Are you sure you wish to abort creation of the host? The process cannot be continued.": "Вы уверены, что хотите прервать создание хоста? Процесс не может быть продолжен.",
@@ -3072,5 +3072,7 @@
     "Value in this room": "Значение в этой комнате",
     "Value": "Значение",
     "Failed to save settings": "Не удалось сохранить настройки",
-    "Show chat effects (animations when receiving e.g. confetti)": "Показать эффекты чата (анимация при получении, например, конфетти)"
+    "Show chat effects (animations when receiving e.g. confetti)": "Показать эффекты чата (анимация при получении, например, конфетти)",
+    "Caution:": "Предупреждение:",
+    "Settings Explorer": "Обзор настроек"
 }

From 8d68cbdb142ab0f9f513d1b3583490824cbb49be Mon Sep 17 00:00:00 2001
From: A-l-exa-n-d-r <A-l-exa-n-d-r@yandex.ru>
Date: Sat, 27 Feb 2021 08:05:08 +0000
Subject: [PATCH 100/420] Translated using Weblate (Russian)

Currently translated at 99.6% (2769 of 2780 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ru/
---
 src/i18n/strings/ru.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 8310676e69..7cbcb08167 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -3068,7 +3068,7 @@
     "Settable at room": "Устанавливается для комнаты",
     "Settable at global": "Устанавливается на глобальном уровне",
     "Level": "Уровень",
-    "This UI does NOT check the types of the values. Use at your own risk.": "Этот пользовательский интерфейс НЕ проверяет типы значений. Используйте на свой риск.",
+    "This UI does NOT check the types of the values. Use at your own risk.": "Этот пользовательский интерфейс НЕ проверяет типы значений. Используйте на свой страх и риск.",
     "Value in this room": "Значение в этой комнате",
     "Value": "Значение",
     "Failed to save settings": "Не удалось сохранить настройки",

From b6d4e3fe9a247835d87337282ebc2eba7af26a20 Mon Sep 17 00:00:00 2001
From: LinAGKar <linus.kardell@gmail.com>
Date: Fri, 26 Feb 2021 07:13:31 +0000
Subject: [PATCH 101/420] Translated using Weblate (Swedish)

Currently translated at 100.0% (2780 of 2780 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sv/
---
 src/i18n/strings/sv.json | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index 916de9ecce..c8a5a41339 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -2996,5 +2996,27 @@
     "Failed to connect to your homeserver. Please close this dialog and try again.": "Misslyckades att ansluta till din hemserver. Vänligen stäng den här dialogrutan och försök igen.",
     "Abort": "Avbryt",
     "Are you sure you wish to abort creation of the host? The process cannot be continued.": "Är du säker på att du vill avbryta skapande av värden? Processen kan inte fortsättas.",
-    "Confirm abort of host creation": "Bekräfta avbrytning av värdskapande"
+    "Confirm abort of host creation": "Bekräfta avbrytning av värdskapande",
+    "Upgrade to %(hostSignupBrand)s": "Uppgradera till %(hostSignupBrand)s",
+    "Edit Values": "Redigera värden",
+    "Values at explicit levels in this room:": "Värden vid explicita nivåer i det här rummet:",
+    "Values at explicit levels:": "Värden vid explicita nivåer:",
+    "Value in this room:": "Värde i det här rummet:",
+    "Value:": "Värde:",
+    "Save setting values": "Spara inställningsvärden",
+    "Values at explicit levels in this room": "Värden vid explicita nivåer i det här rummet",
+    "Values at explicit levels": "Värden vid explicita nivåer",
+    "Settable at room": "Inställningsbar per rum",
+    "Settable at global": "Inställningsbar globalt",
+    "Level": "Nivå",
+    "Setting definition:": "Inställningsdefinition:",
+    "This UI does NOT check the types of the values. Use at your own risk.": "Det här UI:t kontrollerar inte typer för värden. Använd på egen risk.",
+    "Caution:": "Varning:",
+    "Setting:": "Inställning:",
+    "Value in this room": "Värde i det här rummet",
+    "Value": "Värde",
+    "Setting ID": "Inställnings-ID",
+    "Failed to save settings": "Misslyckades att spara inställningar",
+    "Settings Explorer": "Inställningsutforskare",
+    "Show chat effects (animations when receiving e.g. confetti)": "Visa chatteffekter (animeringar när du tar emot t.ex. konfetti)"
 }

From ad38f87287b13eb2ef835781287c16f26169a204 Mon Sep 17 00:00:00 2001
From: linsui <linsui@inbox.lv>
Date: Fri, 26 Feb 2021 14:45:43 +0000
Subject: [PATCH 102/420] Translated using Weblate (Chinese (Simplified))

Currently translated at 80.7% (2245 of 2780 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hans/
---
 src/i18n/strings/zh_Hans.json | 75 ++++++++++++++++++++++++++++++++++-
 1 file changed, 74 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index 167fea70e1..12fb5e2877 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -2409,5 +2409,78 @@
     "The call was answered on another device.": "在另一台设备上应答了该通话。",
     "The call could not be established": "无法建立通话",
     "The other party declined the call.": "对方拒绝了通话。",
-    "Call Declined": "通话被拒绝"
+    "Call Declined": "通话被拒绝",
+    "(connection failed)": "（连接失败）",
+    "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 所有服务器都已禁止参与！此聊天室不再可用。",
+    "%(senderDisplayName)s changed the server ACLs for this room.": "%(senderDisplayName)s 为此聊天室更改了服务器 ACL。",
+    "%(senderDisplayName)s set the server ACLs for this room.": "%(senderDisplayName)s 为此聊天室设置了服务器 ACL。",
+    "Hong Kong": "香港",
+    "Cook Islands": "库克群岛",
+    "Congo - Kinshasa": "刚果金",
+    "Congo - Brazzaville": "刚果布拉柴维尔",
+    "Comoros": "科摩罗",
+    "Colombia": "哥伦比亚",
+    "Cocos (Keeling) Islands": "科科斯基林群岛",
+    "Christmas Island": "圣诞岛",
+    "China": "中国",
+    "Chile": "智利",
+    "Chad": "乍得",
+    "Central African Republic": "中非共和国",
+    "Cayman Islands": "开曼群岛(英)",
+    "Caribbean Netherlands": "荷兰加勒比区",
+    "Cape Verde": "佛得角",
+    "Canada": "加拿大",
+    "Cameroon": "喀麦隆",
+    "Cambodia": "柬埔寨",
+    "Burundi": "布隆迪",
+    "Burkina Faso": "布基纳法索",
+    "Bulgaria": "保加利亚",
+    "Brunei": "文莱",
+    "British Virgin Islands": "英属维尔京群岛",
+    "British Indian Ocean Territory": "英属印度洋领地",
+    "Brazil": "巴西",
+    "Bouvet Island": "布维岛",
+    "Botswana": "博茨瓦纳",
+    "Bosnia": "波斯尼亚",
+    "Bolivia": "玻利维亚",
+    "Armenia": "亚美尼亚",
+    "Bhutan": "不丹",
+    "Bermuda": "百慕大群岛",
+    "Benin": "贝宁",
+    "Belize": "伯利兹",
+    "Belgium": "比利时",
+    "Belarus": "白俄罗斯",
+    "Barbados": "巴巴多斯",
+    "Bangladesh": "孟加拉国",
+    "Bahrain": "巴林",
+    "Bahamas": "巴哈马",
+    "Azerbaijan": "阿塞拜疆",
+    "Austria": "奥地利",
+    "Australia": "澳大利亚",
+    "Aruba": "阿鲁巴岛",
+    "Argentina": "阿根廷",
+    "Antigua & Barbuda": "安提瓜和巴布达",
+    "Antarctica": "南极洲",
+    "Anguilla": "安圭拉",
+    "Angola": "安哥拉",
+    "Andorra": "安道尔",
+    "American Samoa": "美属萨摩亚",
+    "Algeria": "阿尔及利亚",
+    "Albania": "阿尔巴尼亚",
+    "Åland Islands": "奥兰群岛",
+    "Afghanistan": "阿富汗",
+    "United States": "美国",
+    "United Kingdom": "英国",
+    "Your homeserver rejected your log in attempt. This could be due to things just taking too long. Please try again. If this continues, please contact your homeserver administrator.": "您的主服务器已拒绝您的登入尝试。请重试。如果此情况持续发生，请联系您的主服务器管理员。",
+    "Your homeserver was unreachable and was not able to log you in. Please try again. If this continues, please contact your homeserver administrator.": "您的主服务器不可达，无法使您登入。请重试。如果此情况持续发生，请联系您的主服务器管理员。",
+    "Try again": "重试",
+    "We asked the browser to remember which homeserver you use to let you sign in, but unfortunately your browser has forgotten it. Go to the sign in page and try again.": "我们已要求浏览器记住您使用的主服务器，但不幸的是您的浏览器已忘记。请前往登录页面重试。",
+    "We couldn't log you in": "我们无法使您登入",
+    "This will end the conference for everyone. Continue?": "这将结束所有人的会议。是否继续？",
+    "End conference": "结束会议",
+    "You've reached the maximum number of simultaneous calls.": "您已达到并行呼叫最大数量。",
+    "Too Many Calls": "太多呼叫",
+    "Call failed because webcam or microphone could not be accessed. Check that:": "通话失败，因为无法访问网络摄像头或麦克风。请检查：",
+    "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "呼叫失败，因为无法访问任何麦克风。 检查是否已插入麦克风并正确设置。",
+    "Answered Elsewhere": "在其他地方已回答"
 }

From c4940d164381449f857a5c88cc9abbc62939a6aa Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Thu, 25 Feb 2021 01:41:18 +0000
Subject: [PATCH 103/420] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2780 of 2780 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
---
 src/i18n/strings/zh_Hant.json | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index b11ff2274f..64dab74139 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -3068,5 +3068,27 @@
     "Failed to connect to your homeserver. Please close this dialog and try again.": "無法連線到您的家伺服器。請關閉對話框並再試一次。",
     "Abort": "中止",
     "Are you sure you wish to abort creation of the host? The process cannot be continued.": "您確定您想要中止主機建立嗎？流程將無法繼續。",
-    "Confirm abort of host creation": "確認中止主機建立"
+    "Confirm abort of host creation": "確認中止主機建立",
+    "Upgrade to %(hostSignupBrand)s": "升級至 %(hostSignupBrand)s",
+    "Edit Values": "編輯值",
+    "Values at explicit levels in this room:": "此聊天室中明確等級的值：",
+    "Values at explicit levels:": "明確等級的值：",
+    "Value in this room:": "此聊天室中的值：",
+    "Value:": "值：",
+    "Save setting values": "儲存設定值",
+    "Values at explicit levels in this room": "此聊天室中明確等級的值",
+    "Values at explicit levels": "明確等級的值",
+    "Settable at room": "聊天室設定",
+    "Settable at global": "全域設定",
+    "Level": "等級",
+    "Setting definition:": "設定定義：",
+    "This UI does NOT check the types of the values. Use at your own risk.": "此使用者介面不會檢查值的類型。使用風險自負。",
+    "Caution:": "警告：",
+    "Setting:": "設定：",
+    "Value in this room": "此聊天室中的值",
+    "Value": "值",
+    "Setting ID": "設定 ID",
+    "Failed to save settings": "儲存設定失敗",
+    "Settings Explorer": "設定瀏覽程式",
+    "Show chat effects (animations when receiving e.g. confetti)": "顯示聊天效果（當收到如五彩紙屑時顯示動畫）"
 }

From 66cf2075fe9457f5190eb43723efc6cefd327285 Mon Sep 17 00:00:00 2001
From: waclaw66 <waclaw66@seznam.cz>
Date: Fri, 26 Feb 2021 08:30:59 +0000
Subject: [PATCH 104/420] Translated using Weblate (Czech)

Currently translated at 100.0% (2780 of 2780 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
---
 src/i18n/strings/cs.json | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index 3ee9c73399..47a99ab670 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -231,7 +231,7 @@
     "You do not have permission to do that in this room.": "V této místnosti nemáte na toto právo.",
     "You cannot place a call with yourself.": "Nemůžete volat sami sobě.",
     "You cannot place VoIP calls in this browser.": "V tomto prohlížeči nelze vytáčet VoIP hovory.",
-    "You do not have permission to post to this room": "Na přispívání do této místnosti nemáte právo",
+    "You do not have permission to post to this room": "Nemáte oprávnění zveřejňovat příspěvky v této místnosti",
     "Online": "Online",
     "Offline": "Offline",
     "Check for update": "Zkontrolovat aktualizace",
@@ -1409,7 +1409,7 @@
     "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "Odeslat pozvánku pomocí serveru identit. <default>Použít výchozí (%(defaultIdentityServerName)s)</default> nebo přenastavit <settings>Nastavení</settings>.",
     "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "Odeslat pozvánku pomocí serveru identit. Přenastavit v <settings>Nastavení</settings>.",
     "Close dialog": "Zavřít dialog",
-    "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Napište nám prosím co se pokazilo a nebo nám napište issue na GitHub, kde popíšete problém.",
+    "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Dejte nám vědět, prosím, co se pokazilo nebo vytvořte issue na GitHubu, kde problém popište.",
     "Removing…": "Odstaňování…",
     "Clear all data": "Smazat všechna data",
     "Please enter a name for the room": "Zadejte prosím název místnosti",
@@ -1529,7 +1529,7 @@
     "Flags": "Vlajky",
     "Quick Reactions": "Rychlé reakce",
     "Cancel search": "Zrušit hledání",
-    "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "Vyrobte prosím <newIssueLink>nové issue</newIssueLink> na GitHubu abychom mohli chybu opravit.",
+    "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "Vytvořte prosím <newIssueLink>novou issue</newIssueLink> na GitHubu abychom mohli chybu opravit.",
     "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)s neudělali %(count)s krát žádnou změnu",
     "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)s neudělali žádnou změnu",
     "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)s neudělal(a) %(count)s krát žádnou změnu",
@@ -2981,5 +2981,27 @@
     "Failed to connect to your homeserver. Please close this dialog and try again.": "Připojení k domovskému serveru se nezdařilo. Zavřete toto dialogové okno a zkuste to znovu.",
     "Abort": "Přerušit",
     "Are you sure you wish to abort creation of the host? The process cannot be continued.": "Opravdu chcete přerušit vytváření hostitele? Proces nemůže být navázán.",
-    "Confirm abort of host creation": "Potvrďte přerušení vytváření hostitele"
+    "Confirm abort of host creation": "Potvrďte přerušení vytváření hostitele",
+    "Upgrade to %(hostSignupBrand)s": "Aktualizovat na %(hostSignupBrand)s",
+    "Edit Values": "Upravit hodnoty",
+    "Values at explicit levels in this room:": "Hodnoty na explicitních úrovních v této místnosti:",
+    "Values at explicit levels:": "Hodnoty na explicitních úrovních:",
+    "Value in this room:": "Hodnota v této místnosti:",
+    "Value:": "Hodnota:",
+    "Save setting values": "Uložit hodnoty nastavení",
+    "Values at explicit levels in this room": "Hodnoty na explicitních úrovních v této místnosti",
+    "Values at explicit levels": "Hodnoty na explicitních úrovních",
+    "Settable at room": "Nastavitelné v místnosti",
+    "Settable at global": "Nastavitelné na globální úrovni",
+    "Level": "Úroveň",
+    "Setting definition:": "Definice nastavení:",
+    "This UI does NOT check the types of the values. Use at your own risk.": "Toto uživatelské rozhraní NEKONTROLUJE typy hodnot. Použití na vlastní nebezpečí.",
+    "Caution:": "Pozor:",
+    "Setting:": "Nastavení:",
+    "Value in this room": "Hodnota v této místnosti",
+    "Value": "Hodnota",
+    "Setting ID": "ID nastavení",
+    "Failed to save settings": "Nastavení se nepodařilo uložit",
+    "Settings Explorer": "Průzkumník nastavení",
+    "Show chat effects (animations when receiving e.g. confetti)": "Zobrazit efekty chatu (animace např. při přijetí konfet)"
 }

From b6a5b08a86cb466d7e11982c1f0b5a91c53bb5ae Mon Sep 17 00:00:00 2001
From: XoseM <correoxm@disroot.org>
Date: Thu, 25 Feb 2021 06:09:06 +0000
Subject: [PATCH 105/420] Translated using Weblate (Galician)

Currently translated at 100.0% (2780 of 2780 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
---
 src/i18n/strings/gl.json | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index b309f12245..98a984d860 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -3065,5 +3065,27 @@
     "Failed to connect to your homeserver. Please close this dialog and try again.": "Fallou a conexión co teu servidor de inicio. Pecha esta información e inténtao outra vez.",
     "Abort": "Abortar",
     "Are you sure you wish to abort creation of the host? The process cannot be continued.": "Tes a certeza de querer cancelar a creación do servidor? O proceso non pode ser completado.",
-    "Confirm abort of host creation": "Corfirma que cancelas a creación do servidor"
+    "Confirm abort of host creation": "Corfirma que cancelas a creación do servidor",
+    "Upgrade to %(hostSignupBrand)s": "Actualizar a %(hostSignupBrand)s",
+    "Edit Values": "Editar valores",
+    "Values at explicit levels in this room:": "Valores a niveis explícitos nesta sala:",
+    "Values at explicit levels:": "Valores a niveis explícitos:",
+    "Value in this room:": "Valor nesta sala:",
+    "Value:": "Valor:",
+    "Save setting values": "Gardar valores configurados",
+    "Values at explicit levels in this room": "Valores a niveis explícitos nesta sala",
+    "Values at explicit levels": "Valores e niveis explícitos",
+    "Settable at room": "Configurable na sala",
+    "Settable at global": "Configurable como global",
+    "Level": "Nivel",
+    "Setting definition:": "Definición do axuste:",
+    "This UI does NOT check the types of the values. Use at your own risk.": "Esta IU non comproba os tipos dos valores. Usa baixo a túa responsabilidade.",
+    "Caution:": "Aviso:",
+    "Setting:": "Axuste:",
+    "Value in this room": "Valor nesta sala",
+    "Value": "Valor",
+    "Setting ID": "ID do axuste",
+    "Failed to save settings": "Non se gardaron os axustes",
+    "Settings Explorer": "Navegar nos axustes",
+    "Show chat effects (animations when receiving e.g. confetti)": "Mostrar efectos no chat (animacións na recepción, ex. confetti)"
 }

From 73421597b63b7f3f266f7fcf94bb4030c70b9a12 Mon Sep 17 00:00:00 2001
From: Besnik Bleta <besnik@programeshqip.org>
Date: Fri, 26 Feb 2021 17:16:44 +0000
Subject: [PATCH 106/420] Translated using Weblate (Albanian)

Currently translated at 99.6% (2769 of 2780 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/
---
 src/i18n/strings/sq.json | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index e8e47ac81b..dd58154b5a 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -2990,7 +2990,7 @@
     "If you've forgotten your Security Key you can <button>set up new recovery options</button>": "Nëse keni harruar Kyçin tuaj të Sigurisë, mund të <button>ujdisni mundësi të reja rimarrjeje</button>.",
     "Your Security Key has been <b>copied to your clipboard</b>, paste it to:": "Kyçi juaj i Sigurisë është <b>kopjuar te e papastra juaj</b>, ngjiteni te:",
     "Confirm your Security Phrase": "Ripohoni Frazën tuaj të Sigurisë",
-    "Secure your backup with a Security Phrase": "Sigurojeni kopjeruajtjen tuaj me një Frazë Sigurie.",
+    "Secure your backup with a Security Phrase": "Sigurojeni kopjeruajtjen tuaj me një Frazë Sigurie",
     "Repeat your Security Phrase...": "Përsëritni Frazën tuaj të Sigurisë…",
     "Please enter your Security Phrase a second time to confirm.": "Ju lutemi, që të ripohohet, rijepeni Frazën tuaj të Sigurisë.",
     "This session has detected that your Security Phrase and key for Secure Messages have been removed.": "Ky sesion ka pikasur se Fraza e Sigurisë dhe kyçi juaj për Mesazhe të Sigurt janë hequr.",
@@ -3056,5 +3056,25 @@
     "Failed to connect to your homeserver. Please close this dialog and try again.": "S’u arrit të lidhej me shërbyesin tuaj Home. Ju lutemi, mbylleni këtë dialog dhe riprovoni.",
     "Abort": "Ndërprite",
     "Are you sure you wish to abort creation of the host? The process cannot be continued.": "Jeni i sigurt se doni të ndërpritet krijimi i strehës? Procesi s’mund të vazhdohet.",
-    "Confirm abort of host creation": "Ripohoni ndërprerjen e krijimit të strehës"
+    "Confirm abort of host creation": "Ripohoni ndërprerjen e krijimit të strehës",
+    "Upgrade to %(hostSignupBrand)s": "Përmirësojeni me %(hostSignupBrand)s",
+    "Edit Values": "Përpunoni Vlera",
+    "Values at explicit levels in this room:": "Vlera në nivele shprehimisht në këtë dhomë:",
+    "Values at explicit levels:": "Vlera në nivele shprehimisht:",
+    "Value in this room:": "Vlerë në këtë dhomë:",
+    "Value:": "Vlerë:",
+    "Save setting values": "Ruaj vlera rregullimi",
+    "Values at explicit levels in this room": "Vlera në nivele shprehimisht në këtë dhomë",
+    "Values at explicit levels": "Vlera në nivele shprehimisht",
+    "Settable at room": "I caktueshëm për dhomën",
+    "Settable at global": "I caktueshëm te të përgjithshmet",
+    "Level": "Nivel",
+    "Setting definition:": "Përkufizim rregullimi:",
+    "This UI does NOT check the types of the values. Use at your own risk.": "Kjo UI NUK kontrollon llojet e vlerave. Përdorini me përgjegjësinë tuaj.",
+    "Setting:": "Rregullim:",
+    "Value in this room": "Vlerë në këtë dhomë",
+    "Value": "Vlerë",
+    "Failed to save settings": "S’u arrit të ruhen rregullimet",
+    "Settings Explorer": "Eksplorues Rregullimesh",
+    "Show chat effects (animations when receiving e.g. confetti)": "Shfaq efekte fjalosjeje (animacione kur merren bonbone, për shembull)"
 }

From 55bfe21df0ed8827b7dca40cd580ac91cf202f82 Mon Sep 17 00:00:00 2001
From: Trendyne <eiko@chiru.no>
Date: Thu, 25 Feb 2021 14:25:53 +0000
Subject: [PATCH 107/420] Translated using Weblate (Icelandic)

Currently translated at 14.8% (413 of 2780 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/is/
---
 src/i18n/strings/is.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/is.json b/src/i18n/strings/is.json
index 6f561331f6..ddb3bbc66d 100644
--- a/src/i18n/strings/is.json
+++ b/src/i18n/strings/is.json
@@ -458,5 +458,7 @@
     "Passphrases must match": "Lykilfrasar verða að stemma",
     "Passphrase must not be empty": "Lykilfrasi má ekki vera auður",
     "Create Account": "Stofna Reikning",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "vinsamlegast setja upp <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, eða <safariLink>Safari</safariLink> fyrir besta reynsluna."
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "vinsamlegast setja upp <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, eða <safariLink>Safari</safariLink> fyrir besta reynsluna.",
+    "Explore rooms": "Kanna herbergi",
+    "Sign In": "Skrá inn"
 }

From 36ef0be05b028a4e97afac0499491a20f9ae7ab1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Thu, 25 Feb 2021 16:43:43 +0000
Subject: [PATCH 108/420] Translated using Weblate (Estonian)

Currently translated at 100.0% (2780 of 2780 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
---
 src/i18n/strings/et.json | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index 7769cf61c8..eb895f5f26 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -3066,5 +3066,27 @@
     "Privacy Policy": "Privaatsuspoliitika",
     "Cookie Policy": "Küpsiste kasutamine",
     "Learn more in our <privacyPolicyLink />, <termsOfServiceLink /> and <cookiePolicyLink />.": "Lisateavet leiad <privacyPolicyLink />, <termsOfServiceLink /> ja <cookiePolicyLink /> lehtedelt.",
-    "Failed to connect to your homeserver. Please close this dialog and try again.": "Ei õnnestunud ühendada koduserveriga. Palun sulge see aken ja proovi uuesti."
+    "Failed to connect to your homeserver. Please close this dialog and try again.": "Ei õnnestunud ühendada koduserveriga. Palun sulge see aken ja proovi uuesti.",
+    "Upgrade to %(hostSignupBrand)s": "Kui soovid, siis võta kasutusele %(hostSignupBrand)s",
+    "Edit Values": "Muuda väärtusi",
+    "Values at explicit levels in this room:": "Väärtused konkreetsel tasemel selles jututoas:",
+    "Values at explicit levels:": "Väärtused konkreetsel tasemel:",
+    "Value in this room:": "Väärtus selles jututoas:",
+    "Value:": "Väärtus:",
+    "Save setting values": "Salvesta seadistuste väärtused",
+    "Values at explicit levels in this room": "Väärtused konkreetsel tasemel selles jututoas",
+    "Values at explicit levels": "Väärtused konkreetsel tasemel",
+    "Settable at room": "Seadistatav jututoa-kohaselt",
+    "Settable at global": "Seadistatav üldiselt",
+    "Level": "Tase",
+    "Setting definition:": "Seadistuse määratlus:",
+    "This UI does NOT check the types of the values. Use at your own risk.": "See kasutajaliides ei oska kontrollida väärtuste tüüpi ja vormingut. Muudatusi teed omal vastutusel.",
+    "Caution:": "Hoiatus:",
+    "Setting:": "Seadistus:",
+    "Value in this room": "Väärtus selles jututoas",
+    "Value": "Väärtus",
+    "Setting ID": "Seadistuse tunnus",
+    "Failed to save settings": "Seadistuste salvestamine ei õnnestunud",
+    "Settings Explorer": "Seadistuste haldur",
+    "Show chat effects (animations when receiving e.g. confetti)": "Näita vestluses edevat graafikat (näiteks kui keegi on saatnud serpentiine)"
 }

From d679708058befe021f8fba23594180aa76ec4554 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 1 Mar 2021 15:40:46 +0000
Subject: [PATCH 109/420] Fix styling of disabled options in an Iconized menu

---
 res/css/views/context_menus/_IconizedContextMenu.scss | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/res/css/views/context_menus/_IconizedContextMenu.scss b/res/css/views/context_menus/_IconizedContextMenu.scss
index d911ac6dfe..204435995f 100644
--- a/res/css/views/context_menus/_IconizedContextMenu.scss
+++ b/res/css/views/context_menus/_IconizedContextMenu.scss
@@ -75,6 +75,11 @@ limitations under the License.
                 background-color: $menu-selected-color;
             }
 
+            &.mx_AccessibleButton_disabled {
+                opacity: 0.5;
+                cursor: not-allowed;
+            }
+
             img, .mx_IconizedContextMenu_icon { // icons
                 width: 16px;
                 min-width: 16px;

From ce648633266c53d80148a498b98617f88629a282 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 1 Mar 2021 15:53:16 +0000
Subject: [PATCH 110/420] Annotate User Menu handle with currently selected
 space

---
 res/css/structures/_UserMenu.scss      |  1 +
 src/components/structures/UserMenu.tsx | 40 ++++++++++++++++++++------
 2 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/res/css/structures/_UserMenu.scss b/res/css/structures/_UserMenu.scss
index 2a4453df70..3badb0850c 100644
--- a/res/css/structures/_UserMenu.scss
+++ b/res/css/structures/_UserMenu.scss
@@ -72,6 +72,7 @@ limitations under the License.
             position: relative; // to make default avatars work
             margin-right: 8px;
             height: 32px; // to remove the unknown 4px gap the browser puts below it
+            padding: 3px 0; // to align with and without using doubleName
 
             .mx_UserMenu_userAvatar {
                 border-radius: 32px; // should match avatar size
diff --git a/src/components/structures/UserMenu.tsx b/src/components/structures/UserMenu.tsx
index 5ed6a00d74..b31a5f4b8e 100644
--- a/src/components/structures/UserMenu.tsx
+++ b/src/components/structures/UserMenu.tsx
@@ -15,13 +15,18 @@ limitations under the License.
 */
 
 import React, { createRef } from "react";
+import { Room } from "matrix-js-sdk/src/models/room";
+import classNames from "classnames";
+import * as fbEmitter from "fbemitter";
+
 import { MatrixClientPeg } from "../../MatrixClientPeg";
 import defaultDispatcher from "../../dispatcher/dispatcher";
+import dis from "../../dispatcher/dispatcher";
 import { ActionPayload } from "../../dispatcher/payloads";
 import { Action } from "../../dispatcher/actions";
 import { _t } from "../../languageHandler";
 import { ContextMenuButton } from "./ContextMenu";
-import {USER_NOTIFICATIONS_TAB, USER_SECURITY_TAB} from "../views/dialogs/UserSettingsDialog";
+import { USER_NOTIFICATIONS_TAB, USER_SECURITY_TAB } from "../views/dialogs/UserSettingsDialog";
 import { OpenToTabPayload } from "../../dispatcher/payloads/OpenToTabPayload";
 import FeedbackDialog from "../views/dialogs/FeedbackDialog";
 import Modal from "../../Modal";
@@ -30,11 +35,10 @@ import SettingsStore from "../../settings/SettingsStore";
 import {getCustomTheme} from "../../theme";
 import AccessibleButton, {ButtonEvent} from "../views/elements/AccessibleButton";
 import SdkConfig from "../../SdkConfig";
-import {getHomePageUrl} from "../../utils/pages";
+import { getHomePageUrl } from "../../utils/pages";
 import { OwnProfileStore } from "../../stores/OwnProfileStore";
 import { UPDATE_EVENT } from "../../stores/AsyncStore";
 import BaseAvatar from '../views/avatars/BaseAvatar';
-import classNames from "classnames";
 import AccessibleTooltipButton from "../views/elements/AccessibleTooltipButton";
 import { SettingLevel } from "../../settings/SettingLevel";
 import IconizedContextMenu, {
@@ -42,16 +46,16 @@ import IconizedContextMenu, {
     IconizedContextMenuOptionList,
 } from "../views/context_menus/IconizedContextMenu";
 import { CommunityPrototypeStore } from "../../stores/CommunityPrototypeStore";
-import * as fbEmitter from "fbemitter";
 import GroupFilterOrderStore from "../../stores/GroupFilterOrderStore";
 import { showCommunityInviteDialog } from "../../RoomInvite";
-import dis from "../../dispatcher/dispatcher";
 import { RightPanelPhases } from "../../stores/RightPanelStorePhases";
 import ErrorDialog from "../views/dialogs/ErrorDialog";
 import EditCommunityPrototypeDialog from "../views/dialogs/EditCommunityPrototypeDialog";
-import {UIFeature} from "../../settings/UIFeature";
+import { UIFeature } from "../../settings/UIFeature";
 import HostSignupAction from "./HostSignupAction";
-import {IHostSignupConfig} from "../views/dialogs/HostSignupDialogTypes";
+import { IHostSignupConfig } from "../views/dialogs/HostSignupDialogTypes";
+import SpaceStore, { UPDATE_SELECTED_SPACE } from "../../stores/SpaceStore";
+import RoomName from "../views/elements/RoomName";
 
 interface IProps {
     isMinimized: boolean;
@@ -62,6 +66,7 @@ type PartialDOMRect = Pick<DOMRect, "width" | "left" | "top" | "height">;
 interface IState {
     contextMenuPosition: PartialDOMRect;
     isDarkTheme: boolean;
+    selectedSpace?: Room;
 }
 
 export default class UserMenu extends React.Component<IProps, IState> {
@@ -79,6 +84,9 @@ export default class UserMenu extends React.Component<IProps, IState> {
         };
 
         OwnProfileStore.instance.on(UPDATE_EVENT, this.onProfileUpdate);
+        if (SettingsStore.getValue("feature_spaces")) {
+            SpaceStore.instance.on(UPDATE_SELECTED_SPACE, this.onSelectedSpaceUpdate);
+        }
     }
 
     private get hasHomePage(): boolean {
@@ -96,6 +104,9 @@ export default class UserMenu extends React.Component<IProps, IState> {
         if (this.dispatcherRef) defaultDispatcher.unregister(this.dispatcherRef);
         OwnProfileStore.instance.off(UPDATE_EVENT, this.onProfileUpdate);
         this.tagStoreRef.remove();
+        if (SettingsStore.getValue("feature_spaces")) {
+            SpaceStore.instance.off(UPDATE_SELECTED_SPACE, this.onSelectedSpaceUpdate);
+        }
     }
 
     private onTagStoreUpdate = () => {
@@ -120,6 +131,10 @@ export default class UserMenu extends React.Component<IProps, IState> {
         this.forceUpdate();
     };
 
+    private onSelectedSpaceUpdate = async (selectedSpace?: Room) => {
+        this.setState({ selectedSpace });
+    };
+
     private onThemeChanged = () => {
         this.setState({isDarkTheme: this.isUserOnDarkTheme()});
     };
@@ -517,7 +532,16 @@ export default class UserMenu extends React.Component<IProps, IState> {
                 {/* masked image in CSS */}
             </span>
         );
-        if (prototypeCommunityName) {
+        if (this.state.selectedSpace) {
+            name = (
+                <div className="mx_UserMenu_doubleName">
+                    <span className="mx_UserMenu_userName">{displayName}</span>
+                    <RoomName room={this.state.selectedSpace}>
+                        {(roomName) => <span className="mx_UserMenu_subUserName">{roomName}</span>}
+                    </RoomName>
+                </div>
+            );
+        } else if (prototypeCommunityName) {
             name = (
                 <div className="mx_UserMenu_doubleName">
                     <span className="mx_UserMenu_userName">{prototypeCommunityName}</span>

From 70f1303544c65d46ffb7233259ba33b2ac3d2fa5 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 1 Mar 2021 16:48:35 +0000
Subject: [PATCH 111/420] Fix invite svg viewbox

---
 res/img/element-icons/room/invite.svg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/img/element-icons/room/invite.svg b/res/img/element-icons/room/invite.svg
index 655f9f118a..d2ecb837b2 100644
--- a/res/img/element-icons/room/invite.svg
+++ b/res/img/element-icons/room/invite.svg
@@ -1,3 +1,3 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="24" height="24" viewBox="-0.4 1 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path fill-rule="evenodd" clip-rule="evenodd" d="M19.1001 9C18.7779 9 18.5168 8.73883 18.5168 8.41667V6.08333H16.1834C15.8613 6.08333 15.6001 5.82217 15.6001 5.5C15.6001 5.17783 15.8613 4.91667 16.1834 4.91667H18.5168V2.58333C18.5168 2.26117 18.7779 2 19.1001 2C19.4223 2 19.6834 2.26117 19.6834 2.58333V4.91667H22.0168C22.3389 4.91667 22.6001 5.17783 22.6001 5.5C22.6001 5.82217 22.3389 6.08333 22.0168 6.08333H19.6834V8.41667C19.6834 8.73883 19.4223 9 19.1001 9ZM19.6001 11C20.0669 11 20.5212 10.9467 20.9574 10.8458C21.1161 11.5383 21.2 12.2594 21.2 13C21.2 16.1409 19.6917 18.9294 17.3598 20.6808V20.6807C16.0014 21.7011 14.3635 22.3695 12.5815 22.5505C12.2588 22.5832 11.9314 22.6 11.6 22.6C6.29807 22.6 2 18.302 2 13C2 7.69809 6.29807 3.40002 11.6 3.40002C12.3407 3.40002 13.0618 3.48391 13.7543 3.64268C13.6534 4.07884 13.6001 4.53319 13.6001 5C13.6001 8.31371 16.2864 11 19.6001 11ZM11.5999 20.68C13.6754 20.68 15.5585 19.8567 16.9407 18.5189C16.0859 16.4086 14.0167 14.92 11.5998 14.92C9.18298 14.92 7.11378 16.4086 6.25901 18.5189C7.64115 19.8567 9.52436 20.68 11.5999 20.68ZM11.7426 7.41172C10.3168 7.54168 9.2 8.74043 9.2 10.2C9.2 11.7464 10.4536 13 12 13C13.0308 13 13.9315 12.443 14.4176 11.6135C13.0673 10.6058 12.0929 9.12248 11.7426 7.41172Z" fill="black"/>
 </svg>

From ea61b18c1877173cd206734c2926fca04447f0c1 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 1 Mar 2021 17:02:02 +0000
Subject: [PATCH 112/420] Iterate Space Panel alignments

---
 res/css/structures/_SpacePanel.scss           | 99 +++++++++++--------
 src/components/views/spaces/SpacePanel.tsx    | 21 ++--
 .../views/spaces/SpaceTreeLevel.tsx           | 15 ++-
 3 files changed, 81 insertions(+), 54 deletions(-)

diff --git a/res/css/structures/_SpacePanel.scss b/res/css/structures/_SpacePanel.scss
index 8de85f95ef..324757648f 100644
--- a/res/css/structures/_SpacePanel.scss
+++ b/res/css/structures/_SpacePanel.scss
@@ -2,8 +2,6 @@
 Copyright 2021 The Matrix.org Foundation C.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
 
@@ -18,8 +16,12 @@ limitations under the License.
 
 $topLevelHeight: 32px;
 $nestedHeight: 24px;
-$gutterSize: 21px;
+$gutterSize: 17px;
 $activeStripeSize: 4px;
+$activeBorderTransparentGap: 2px;
+
+$activeBackgroundColor: $roomtile-selected-bg-color;
+$activeBorderColor: $secondary-fg-color;
 
 .mx_SpacePanel {
     flex: 0 0 auto;
@@ -68,11 +70,14 @@ $activeStripeSize: 4px;
         cursor: pointer;
     }
 
-    .mx_SpaceItem {
-        position: relative;
-    }
-
     .mx_SpaceItem.collapsed {
+        .mx_SpaceButton {
+            .mx_NotificationBadge {
+                right: -4px;
+                top: -4px;
+            }
+        }
+
         & > .mx_SpaceButton > .mx_SpaceButton_toggleCollapse {
             transform: rotate(-90deg);
         }
@@ -84,20 +89,35 @@ $activeStripeSize: 4px;
 
     .mx_SpaceItem:not(.hasSubSpaces) > .mx_SpaceButton {
         margin-left: $gutterSize;
-
-        &.mx_SpaceButton_active {
-            &::before {
-                left: -$gutterSize;
-            }
-        }
     }
 
     .mx_SpaceButton {
         border-radius: 8px;
         position: relative;
-        margin-bottom: 16px;
+        margin-bottom: 2px;
         display: flex;
         align-items: center;
+        padding: 4px;
+
+        &.mx_SpaceButton_active {
+            &:not(.mx_SpaceButton_narrow) .mx_SpaceButton_selectionWrapper {
+                background-color: $activeBackgroundColor;
+                border-radius: 8px;
+            }
+
+            &.mx_SpaceButton_narrow {
+                .mx_BaseAvatar, .mx_SpaceButton_avatarPlaceholder {
+                    border: 2px $activeBorderColor solid;
+                    border-radius: 11px;
+                }
+            }
+        }
+
+        .mx_SpaceButton_selectionWrapper {
+            display: flex;
+            flex: 1;
+            align-items: center;
+        }
 
         .mx_SpaceButton_name {
             flex: 1;
@@ -107,7 +127,7 @@ $activeStripeSize: 4px;
             max-width: 150px;
             text-overflow: ellipsis;
             overflow: hidden;
-
+            padding-right: 8px;
             font-size: $font-14px;
             line-height: $font-18px;
         }
@@ -123,24 +143,12 @@ $activeStripeSize: 4px;
             mask-image: url('$(res)/img/feather-customised/chevron-down.svg');
         }
 
-        &.mx_SpaceButton_active {
-            &::before {
-                position: absolute;
-                content: '';
-                width: $activeStripeSize;
-                top: 0;
-                left: 0;
-                bottom: 0;
-                background-color: $accent-color;
-                border-radius: 0 4px 4px 0;
-            }
-        }
-
-        .mx_SpaceButton_avatarPlaceholder {
+        .mx_SpaceButton_icon {
             width: $topLevelHeight;
             min-width: $topLevelHeight;
             height: $topLevelHeight;
             border-radius: 8px;
+            position: relative;
 
             &::before {
                 position: absolute;
@@ -155,7 +163,7 @@ $activeStripeSize: 4px;
             }
         }
 
-        &.mx_SpaceButton_home .mx_SpaceButton_avatarPlaceholder {
+        &.mx_SpaceButton_home .mx_SpaceButton_icon {
             background-color: #ffffff;
 
             &::before {
@@ -164,19 +172,28 @@ $activeStripeSize: 4px;
             }
         }
 
-        &.mx_SpaceButton_newCancel .mx_SpaceButton_avatarPlaceholder {
-            background-color: $icon-button-color;
+        .mx_SpaceButton_avatarPlaceholder {
+            border: $activeBorderTransparentGap transparent solid;
+            padding: $activeBorderTransparentGap;
+        }
 
-            &::before {
-                transform: rotate(45deg);
+        .mx_BaseAvatar {
+            /* moving the border-radius to this element from _image
+            element so we can add a border to it without the initials being displaced */
+            overflow: hidden;
+            border: 2px transparent solid;
+            padding: $activeBorderTransparentGap;
+
+            .mx_BaseAvatar_initial {
+                top: $activeBorderTransparentGap;
+                left: $activeBorderTransparentGap;
+            }
+
+            .mx_BaseAvatar_image {
+                border-radius: 8px;
             }
         }
 
-        .mx_BaseAvatar_image {
-            border-radius: 8px;
-        }
-    }
-
     .mx_SpacePanel_badgeContainer {
         height: 16px;
         // don't set width so that it takes no space when there is no badge to show
@@ -201,8 +218,8 @@ $activeStripeSize: 4px;
         .mx_SpaceButton {
             .mx_SpacePanel_badgeContainer {
                 position: absolute;
-                right: -8px;
-                top: -4px;
+                right: 0px;
+                top: 2px;
             }
         }
     }
diff --git a/src/components/views/spaces/SpacePanel.tsx b/src/components/views/spaces/SpacePanel.tsx
index bc9cd5c9fd..760181e0e0 100644
--- a/src/components/views/spaces/SpacePanel.tsx
+++ b/src/components/views/spaces/SpacePanel.tsx
@@ -56,9 +56,10 @@ const SpaceButton: React.FC<IButtonProps> = ({
 }) => {
     const classes = classNames("mx_SpaceButton", className, {
         mx_SpaceButton_active: selected,
+        mx_SpaceButton_narrow: isNarrow,
     });
 
-    let avatar = <div className="mx_SpaceButton_avatarPlaceholder" />;
+    let avatar = <div className="mx_SpaceButton_avatarPlaceholder"><div className="mx_SpaceButton_icon" /></div>;
     if (space) {
         avatar = <RoomAvatar width={32} height={32} room={space} />;
     }
@@ -74,18 +75,22 @@ const SpaceButton: React.FC<IButtonProps> = ({
     if (isNarrow) {
         button = (
             <RovingAccessibleTooltipButton className={classes} title={tooltip} onClick={onClick} role="treeitem">
-                { avatar }
-                { notifBadge }
-                { children }
+                <div className="mx_SpaceButton_selectionWrapper">
+                    { avatar }
+                    { notifBadge }
+                    { children }
+                </div>
             </RovingAccessibleTooltipButton>
         );
     } else {
         button = (
             <RovingAccessibleButton className={classes} onClick={onClick} role="treeitem">
-                { avatar }
-                <span className="mx_SpaceButton_name">{ tooltip }</span>
-                { notifBadge }
-                { children }
+                <div className="mx_SpaceButton_selectionWrapper">
+                    { avatar }
+                    <span className="mx_SpaceButton_name">{ tooltip }</span>
+                    { notifBadge }
+                    { children }
+                </div>
             </RovingAccessibleButton>
         );
     }
diff --git a/src/components/views/spaces/SpaceTreeLevel.tsx b/src/components/views/spaces/SpaceTreeLevel.tsx
index 14fe68ff66..f94798433f 100644
--- a/src/components/views/spaces/SpaceTreeLevel.tsx
+++ b/src/components/views/spaces/SpaceTreeLevel.tsx
@@ -95,6 +95,7 @@ export class SpaceItem extends React.PureComponent<IItemProps, IItemState> {
         const classes = classNames("mx_SpaceButton", {
             mx_SpaceButton_active: isActive,
             mx_SpaceButton_hasMenuOpen: !!this.state.contextMenuPosition,
+            mx_SpaceButton_narrow: isNarrow,
         });
         const notificationState = SpaceStore.instance.getNotificationState(space.roomId);
         const childItems = childSpaces && !collapsed ? <SpaceTreeLevel
@@ -129,8 +130,10 @@ export class SpaceItem extends React.PureComponent<IItemProps, IItemState> {
                     role="treeitem"
                 >
                     { toggleCollapseButton }
-                    <RoomAvatar width={avatarSize} height={avatarSize} room={space} />
-                    { notifBadge }
+                    <div className="mx_SpaceButton_selectionWrapper">
+                        <RoomAvatar width={avatarSize} height={avatarSize} room={space} />
+                        { notifBadge }
+                    </div>
                 </RovingAccessibleTooltipButton>
             );
         } else {
@@ -142,9 +145,11 @@ export class SpaceItem extends React.PureComponent<IItemProps, IItemState> {
                     role="treeitem"
                 >
                     { toggleCollapseButton }
-                    <RoomAvatar width={avatarSize} height={avatarSize} room={space} />
-                    <span className="mx_SpaceButton_name">{ space.name }</span>
-                    { notifBadge }
+                    <div className="mx_SpaceButton_selectionWrapper">
+                        <RoomAvatar width={avatarSize} height={avatarSize} room={space} />
+                        <span className="mx_SpaceButton_name">{ space.name }</span>
+                        { notifBadge }
+                    </div>
                 </RovingAccessibleButton>
             );
         }

From 89386b9b2ea5d9fc2ef1ff07d0becdc0ad9fc1ff Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 1 Mar 2021 17:06:56 +0000
Subject: [PATCH 113/420] fix missing closing brace

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

diff --git a/res/css/structures/_SpacePanel.scss b/res/css/structures/_SpacePanel.scss
index 324757648f..563c5eba58 100644
--- a/res/css/structures/_SpacePanel.scss
+++ b/res/css/structures/_SpacePanel.scss
@@ -193,6 +193,7 @@ $activeBorderColor: $secondary-fg-color;
                 border-radius: 8px;
             }
         }
+    }
 
     .mx_SpacePanel_badgeContainer {
         height: 16px;

From d731e82fba3819143144d3d64ebb71309284c4df Mon Sep 17 00:00:00 2001
From: Jaiwanth <jaiwanth2011@gmail.com>
Date: Mon, 1 Mar 2021 22:44:48 +0530
Subject: [PATCH 114/420] Fixed edit for markdown images

Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
---
 src/editor/deserialize.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/editor/deserialize.ts b/src/editor/deserialize.ts
index 6336b4c46b..bc1dd74c7d 100644
--- a/src/editor/deserialize.ts
+++ b/src/editor/deserialize.ts
@@ -60,6 +60,11 @@ function parseLink(a: HTMLAnchorElement, partCreator: PartCreator) {
     }
 }
 
+function parseImage(img: HTMLImageElement, partCreator: PartCreator) {
+    const { src } = img;
+    return partCreator.plain(`![${img.alt.replace(/[[\\\]]/g, c => "\\" + c)}](${src})`);
+}
+
 function parseCodeBlock(n: HTMLElement, partCreator: PartCreator) {
     const parts = [];
     let language = "";
@@ -102,6 +107,8 @@ function parseElement(n: HTMLElement, partCreator: PartCreator, lastNode: HTMLEl
             return parseHeader(n, partCreator);
         case "A":
             return parseLink(<HTMLAnchorElement>n, partCreator);
+        case "IMG":
+            return parseImage(<HTMLImageElement>n, partCreator);
         case "BR":
             return partCreator.newline();
         case "EM":

From 483d56320c8810ae88dbfd934be3c5d3eea8dee1 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 1 Mar 2021 17:27:09 +0000
Subject: [PATCH 115/420] Beginning of space creation UX from space panel

---
 res/css/_components.scss                      |   2 +
 res/css/structures/_SpacePanel.scss           |  19 ++
 res/css/views/spaces/_SpaceBasicSettings.scss |  86 +++++++++
 res/css/views/spaces/_SpaceCreateMenu.scss    | 138 ++++++++++++++
 res/img/element-icons/lock.svg                |   3 +
 res/img/element-icons/plus.svg                |   3 +
 src/components/structures/ContextMenu.tsx     |   3 +-
 .../views/spaces/SpaceBasicSettings.tsx       | 120 ++++++++++++
 .../views/spaces/SpaceCreateMenu.tsx          | 175 ++++++++++++++++++
 src/components/views/spaces/SpacePanel.tsx    |  21 +++
 src/createRoom.ts                             |   4 +-
 src/i18n/strings/en_EN.json                   |  22 ++-
 12 files changed, 588 insertions(+), 8 deletions(-)
 create mode 100644 res/css/views/spaces/_SpaceBasicSettings.scss
 create mode 100644 res/css/views/spaces/_SpaceCreateMenu.scss
 create mode 100644 res/img/element-icons/lock.svg
 create mode 100644 res/img/element-icons/plus.svg
 create mode 100644 src/components/views/spaces/SpaceBasicSettings.tsx
 create mode 100644 src/components/views/spaces/SpaceCreateMenu.tsx

diff --git a/res/css/_components.scss b/res/css/_components.scss
index 29b5262826..8d6597aefa 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -233,6 +233,8 @@
 @import "./views/settings/tabs/user/_PreferencesUserSettingsTab.scss";
 @import "./views/settings/tabs/user/_SecurityUserSettingsTab.scss";
 @import "./views/settings/tabs/user/_VoiceUserSettingsTab.scss";
+@import "./views/spaces/_SpaceBasicSettings.scss";
+@import "./views/spaces/_SpaceCreateMenu.scss";
 @import "./views/terms/_InlineTermsAgreement.scss";
 @import "./views/toasts/_AnalyticsToast.scss";
 @import "./views/toasts/_NonUrgentEchoFailureToast.scss";
diff --git a/res/css/structures/_SpacePanel.scss b/res/css/structures/_SpacePanel.scss
index 563c5eba58..24d2243912 100644
--- a/res/css/structures/_SpacePanel.scss
+++ b/res/css/structures/_SpacePanel.scss
@@ -177,6 +177,25 @@ $activeBorderColor: $secondary-fg-color;
             padding: $activeBorderTransparentGap;
         }
 
+        &.mx_SpaceButton_new .mx_SpaceButton_icon {
+            background-color: $accent-color;
+            transition: all .1s ease-in-out; // TODO transition
+
+            &::before {
+                background-color: #ffffff;
+                mask-image: url('$(res)/img/element-icons/plus.svg');
+                transition: all .2s ease-in-out; // TODO transition
+            }
+        }
+
+        &.mx_SpaceButton_newCancel .mx_SpaceButton_icon {
+            background-color: $icon-button-color;
+
+            &::before {
+                transform: rotate(45deg);
+            }
+        }
+
         .mx_BaseAvatar {
             /* moving the border-radius to this element from _image
             element so we can add a border to it without the initials being displaced */
diff --git a/res/css/views/spaces/_SpaceBasicSettings.scss b/res/css/views/spaces/_SpaceBasicSettings.scss
new file mode 100644
index 0000000000..204ccab2b7
--- /dev/null
+++ b/res/css/views/spaces/_SpaceBasicSettings.scss
@@ -0,0 +1,86 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.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_SpaceBasicSettings {
+    .mx_Field {
+        margin: 32px 0;
+    }
+
+    .mx_SpaceBasicSettings_avatarContainer {
+        display: flex;
+        margin-top: 24px;
+
+        .mx_SpaceBasicSettings_avatar {
+            position: relative;
+            height: 80px;
+            width: 80px;
+            background-color: $tertiary-fg-color;
+            border-radius: 16px;
+        }
+
+        img.mx_SpaceBasicSettings_avatar {
+            width: 80px;
+            height: 80px;
+            object-fit: cover;
+            border-radius: 16px;
+        }
+
+        // only show it when the button is a div and not an img (has avatar)
+        div.mx_SpaceBasicSettings_avatar {
+            cursor: pointer;
+
+            &::before {
+                content: "";
+                position: absolute;
+                height: 80px;
+                width: 80px;
+                top: 0;
+                left: 0;
+                background-color: #ffffff; // white icon fill
+                mask-repeat: no-repeat;
+                mask-position: center;
+                mask-size: 20px;
+                mask-image: url('$(res)/img/element-icons/camera.svg');
+            }
+        }
+
+        > input[type="file"] {
+            display: none;
+        }
+
+        > .mx_AccessibleButton_kind_link {
+            display: inline-block;
+            padding: 0;
+            margin: auto 16px;
+            color: #368bd6;
+        }
+
+        > .mx_SpaceBasicSettings_avatar_remove {
+            color: $notice-primary-color;
+        }
+    }
+
+    .mx_FormButton {
+        padding: 8px 22px;
+        margin-left: auto;
+        display: block;
+        width: min-content;
+    }
+
+    .mx_AccessibleButton_disabled {
+        cursor: not-allowed;
+    }
+}
diff --git a/res/css/views/spaces/_SpaceCreateMenu.scss b/res/css/views/spaces/_SpaceCreateMenu.scss
new file mode 100644
index 0000000000..2a11ec9f23
--- /dev/null
+++ b/res/css/views/spaces/_SpaceCreateMenu.scss
@@ -0,0 +1,138 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.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.
+*/
+
+// TODO: the space panel currently does not have a fixed width,
+// just the headers at each level have a max-width of 150px
+// so this will look slightly off for now. We should probably use css grid for the whole main layout...
+$spacePanelWidth: 200px;
+
+.mx_SpaceCreateMenu_wrapper {
+    // background blur everything except SpacePanel
+    .mx_ContextualMenu_background {
+        background-color: $dialog-backdrop-color;
+        opacity: 0.6;
+        left: $spacePanelWidth;
+    }
+
+    .mx_ContextualMenu {
+        padding: 24px;
+        width: 480px;
+        box-sizing: border-box;
+        background-color: $primary-bg-color;
+
+        > div {
+            > h2 {
+                font-weight: $font-semi-bold;
+                font-size: $font-18px;
+                margin-top: 4px;
+            }
+
+            > p {
+                font-size: $font-15px;
+                color: $secondary-fg-color;
+                margin: 0;
+            }
+        }
+
+        .mx_SpaceCreateMenuType {
+            position: relative;
+            padding: 16px 32px 16px 72px;
+            width: 432px;
+            box-sizing: border-box;
+            border-radius: 8px;
+            border: 1px solid $input-darker-bg-color;
+            font-size: $font-15px;
+            margin: 20px 0;
+
+            > h3 {
+                font-weight: $font-semi-bold;
+                margin: 0 0 4px;
+            }
+
+            > span {
+                color: $secondary-fg-color;
+            }
+
+            &::before {
+                position: absolute;
+                content: '';
+                width: 32px;
+                height: 32px;
+                top: 24px;
+                left: 20px;
+                mask-position: center;
+                mask-repeat: no-repeat;
+                mask-size: 32px;
+                background-color: $tertiary-fg-color;
+            }
+
+            &:hover {
+                border-color: $accent-color;
+
+                &::before {
+                    background-color: $accent-color;
+                }
+
+                > span {
+                    color: $primary-fg-color;
+                }
+            }
+        }
+
+        .mx_SpaceCreateMenuType_public::before {
+            mask-image: url('$(res)/img/globe.svg');
+            mask-size: 26px;
+        }
+        .mx_SpaceCreateMenuType_private::before {
+            mask-image: url('$(res)/img/element-icons/lock.svg');
+        }
+
+        .mx_SpaceCreateMenu_back {
+            width: 28px;
+            height: 28px;
+            position: relative;
+            background-color: $theme-button-bg-color;
+            border-radius: 14px;
+            margin-bottom: 12px;
+
+            &::before {
+                content: "";
+                position: absolute;
+                height: 28px;
+                width: 28px;
+                top: 0;
+                left: 0;
+                background-color: $muted-fg-color;
+                transform: rotate(90deg);
+                mask-repeat: no-repeat;
+                mask-position: 2px 3px;
+                mask-size: 24px;
+                mask-image: url('$(res)/img/feather-customised/chevron-down.svg');
+            }
+        }
+
+        .mx_FormButton {
+            padding: 8px 22px;
+            margin-left: auto;
+            display: block;
+            width: min-content;
+        }
+
+        .mx_AccessibleButton_disabled {
+            cursor: not-allowed;
+        }
+    }
+}
diff --git a/res/img/element-icons/lock.svg b/res/img/element-icons/lock.svg
new file mode 100644
index 0000000000..06fe52a391
--- /dev/null
+++ b/res/img/element-icons/lock.svg
@@ -0,0 +1,3 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.1113 2.6665C11.1839 2.6665 8.00016 5.85026 8.00016 9.77762V13.3332L7.3335 13.3332C6.22893 13.3332 5.3335 14.2286 5.3335 15.3332V27.3332C5.3335 28.4377 6.22893 29.3332 7.3335 29.3332H24.6668C25.7714 29.3332 26.6668 28.4377 26.6668 27.3332V15.3332C26.6668 14.2286 25.7714 13.3332 24.6668 13.3332L24.0002 13.3332V9.77762C24.0002 5.85026 20.8164 2.6665 16.8891 2.6665H15.1113ZM20.4446 13.3332V9.77762C20.4446 7.81394 18.8527 6.22206 16.8891 6.22206H15.1113C13.1476 6.22206 11.5557 7.81394 11.5557 9.77762V13.3332H20.4446Z" fill="#8E99A4"/>
+</svg>
diff --git a/res/img/element-icons/plus.svg b/res/img/element-icons/plus.svg
new file mode 100644
index 0000000000..ea1972237d
--- /dev/null
+++ b/res/img/element-icons/plus.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M8.74986 3.55554C8.74986 3.14133 8.41408 2.80554 7.99986 2.80554C7.58565 2.80554 7.24986 3.14133 7.24986 3.55554V7.24999L3.55542 7.24999C3.14121 7.24999 2.80542 7.58577 2.80542 7.99999C2.80542 8.4142 3.14121 8.74999 3.55542 8.74999L7.24987 8.74999V12.4444C7.24987 12.8586 7.58565 13.1944 7.99987 13.1944C8.41408 13.1944 8.74987 12.8586 8.74987 12.4444V8.74999L12.4443 8.74999C12.8585 8.74999 13.1943 8.4142 13.1943 7.99999C13.1943 7.58577 12.8585 7.24999 12.4443 7.24999L8.74986 7.24999V3.55554Z" fill="#8E99A4"/>
+</svg>
diff --git a/src/components/structures/ContextMenu.tsx b/src/components/structures/ContextMenu.tsx
index b5e5966d91..726ff547ff 100644
--- a/src/components/structures/ContextMenu.tsx
+++ b/src/components/structures/ContextMenu.tsx
@@ -76,6 +76,7 @@ export interface IProps extends IPosition {
     hasBackground?: boolean;
     // whether this context menu should be focus managed. If false it must handle itself
     managed?: boolean;
+    wrapperClassName?: string;
 
     // Function to be called on menu close
     onFinished();
@@ -365,7 +366,7 @@ export class ContextMenu extends React.PureComponent<IProps, IState> {
 
         return (
             <div
-                className="mx_ContextualMenu_wrapper"
+                className={classNames("mx_ContextualMenu_wrapper", this.props.wrapperClassName)}
                 style={{...position, ...wrapperStyle}}
                 onKeyDown={this.onKeyDown}
                 onContextMenu={this.onContextMenuPreventBubbling}
diff --git a/src/components/views/spaces/SpaceBasicSettings.tsx b/src/components/views/spaces/SpaceBasicSettings.tsx
new file mode 100644
index 0000000000..bc378ab956
--- /dev/null
+++ b/src/components/views/spaces/SpaceBasicSettings.tsx
@@ -0,0 +1,120 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.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, {useRef, useState} from "react";
+
+import {_t} from "../../../languageHandler";
+import AccessibleButton from "../elements/AccessibleButton";
+import Field from "../elements/Field";
+
+interface IProps {
+    avatarUrl?: string;
+    avatarDisabled?: boolean;
+    name?: string,
+    nameDisabled?: boolean;
+    topic?: string;
+    topicDisabled?: boolean;
+    setAvatar(avatar: File): void;
+    setName(name: string): void;
+    setTopic(topic: string): void;
+}
+
+const SpaceBasicSettings = ({
+    avatarUrl,
+    avatarDisabled = false,
+    setAvatar,
+    name = "",
+    nameDisabled = false,
+    setName,
+    topic = "",
+    topicDisabled = false,
+    setTopic,
+}: IProps) => {
+    const avatarUploadRef = useRef<HTMLInputElement>();
+    const [avatar, setAvatarDataUrl] = useState(avatarUrl); // avatar data url cache
+
+    let avatarSection;
+    if (avatarDisabled) {
+        if (avatar) {
+            avatarSection = <img className="mx_SpaceBasicSettings_avatar" src={avatar} alt="" />;
+        } else {
+            avatarSection = <div className="mx_SpaceBasicSettings_avatar" />;
+        }
+    } else {
+        if (avatar) {
+            avatarSection = <React.Fragment>
+                <AccessibleButton
+                    className="mx_SpaceBasicSettings_avatar"
+                    onClick={() => avatarUploadRef.current?.click()}
+                    element="img"
+                    src={avatar}
+                    alt=""
+                />
+                <AccessibleButton onClick={() => {
+                    avatarUploadRef.current.value = "";
+                    setAvatarDataUrl(undefined);
+                    setAvatar(undefined);
+                }} kind="link" className="mx_SpaceBasicSettings_avatar_remove">
+                    { _t("Delete") }
+                </AccessibleButton>
+            </React.Fragment>;
+        } else {
+            avatarSection = <React.Fragment>
+                <div className="mx_SpaceBasicSettings_avatar" onClick={() => avatarUploadRef.current?.click()} />
+                <AccessibleButton onClick={() => avatarUploadRef.current?.click()} kind="link">
+                    { _t("Upload") }
+                </AccessibleButton>
+            </React.Fragment>;
+        }
+    }
+
+    return <div className="mx_SpaceBasicSettings">
+        <div className="mx_SpaceBasicSettings_avatarContainer">
+            { avatarSection }
+            <input type="file" ref={avatarUploadRef} onChange={(e) => {
+                if (!e.target.files?.length) return;
+                const file = e.target.files[0];
+                setAvatar(file);
+                const reader = new FileReader();
+                reader.onload = (ev) => {
+                    setAvatarDataUrl(ev.target.result as string);
+                };
+                reader.readAsDataURL(file);
+            }} accept="image/*" />
+        </div>
+
+        <Field
+            name="spaceName"
+            label={_t("Name")}
+            autoFocus={true}
+            value={name}
+            onChange={ev => setName(ev.target.value)}
+            disabled={nameDisabled}
+        />
+
+        <Field
+            name="spaceTopic"
+            element="textarea"
+            label={_t("Description")}
+            value={topic}
+            onChange={ev => setTopic(ev.target.value)}
+            rows={3}
+            disabled={topicDisabled}
+        />
+    </div>;
+};
+
+export default SpaceBasicSettings;
diff --git a/src/components/views/spaces/SpaceCreateMenu.tsx b/src/components/views/spaces/SpaceCreateMenu.tsx
new file mode 100644
index 0000000000..9d0543a6c5
--- /dev/null
+++ b/src/components/views/spaces/SpaceCreateMenu.tsx
@@ -0,0 +1,175 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.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, useState} from "react";
+import classNames from "classnames";
+import {EventType, RoomType, RoomCreateTypeField} from "matrix-js-sdk/src/@types/event";
+
+import {_t} from "../../../languageHandler";
+import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
+import {ChevronFace, ContextMenu} from "../../structures/ContextMenu";
+import FormButton from "../elements/FormButton";
+import createRoom, {IStateEvent, Preset} from "../../../createRoom";
+import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import SpaceBasicSettings from "./SpaceBasicSettings";
+import AccessibleButton from "../elements/AccessibleButton";
+import FocusLock from "react-focus-lock";
+
+const SpaceCreateMenuType = ({ title, description, className, onClick }) => {
+    return (
+        <AccessibleButton className={classNames("mx_SpaceCreateMenuType", className)} onClick={onClick}>
+            <h3>{ title }</h3>
+            <span>{ description }</span>
+        </AccessibleButton>
+    );
+};
+
+enum Visibility {
+    Public,
+    Private,
+}
+
+const SpaceCreateMenu = ({ onFinished }) => {
+    const cli = useContext(MatrixClientContext);
+    const [visibility, setVisibility] = useState<Visibility>(null);
+    const [name, setName] = useState("");
+    const [avatar, setAvatar] = useState<File>(null);
+    const [topic, setTopic] = useState<string>("");
+    const [busy, setBusy] = useState<boolean>(false);
+
+    const onSpaceCreateClick = async () => {
+        if (busy) return;
+        setBusy(true);
+        const initialState: IStateEvent[] = [
+            {
+                type: EventType.RoomHistoryVisibility,
+                content: {
+                    "history_visibility": visibility === Visibility.Public ? "world_readable" : "invited",
+                },
+            },
+        ];
+        if (avatar) {
+            const url = await cli.uploadContent(avatar);
+
+            initialState.push({
+                type: EventType.RoomAvatar,
+                content: { url },
+            });
+        }
+        if (topic) {
+            initialState.push({
+                type: EventType.RoomTopic,
+                content: { topic },
+            });
+        }
+
+        try {
+            await createRoom({
+                createOpts: {
+                    preset: visibility === Visibility.Public ? Preset.PublicChat : Preset.PrivateChat,
+                    name,
+                    creation_content: {
+                        // Based on MSC1840
+                        [RoomCreateTypeField]: RoomType.Space,
+                    },
+                    initial_state: initialState,
+                    power_level_content_override: {
+                        // Only allow Admins to write to the timeline to prevent hidden sync spam
+                        events_default: 100,
+                    },
+                },
+                spinner: false,
+                encryption: false,
+                andView: true,
+                inlineErrors: true,
+            });
+
+            onFinished();
+        } catch (e) {
+            console.error(e);
+        }
+    };
+
+    let body;
+    if (visibility === null) {
+        body = <React.Fragment>
+            <h2>{ _t("Create a space") }</h2>
+            <p>{ _t("Organise rooms into spaces, for just you or anyone") }</p>
+
+            <SpaceCreateMenuType
+                title={_t("Public")}
+                description={_t("Open space for anyone, best for communities")}
+                className="mx_SpaceCreateMenuType_public"
+                onClick={() => setVisibility(Visibility.Public)}
+            />
+            <SpaceCreateMenuType
+                title={_t("Private")}
+                description={_t("Invite only space, best for yourself or teams")}
+                className="mx_SpaceCreateMenuType_private"
+                onClick={() => setVisibility(Visibility.Private)}
+            />
+
+            {/*<p>{ _t("Looking to join an existing space?") }</p>*/}
+        </React.Fragment>;
+    } else {
+        body = <React.Fragment>
+            <AccessibleTooltipButton
+                className="mx_SpaceCreateMenu_back"
+                onClick={() => setVisibility(null)}
+                title={_t("Go back")}
+            />
+
+            <h2>
+                {
+                    visibility === Visibility.Public
+                        ? _t("Personalise your public space")
+                        : _t("Personalise your private space")
+                }
+            </h2>
+            <p>
+                {
+                    _t("Give it a photo, name and description to help you identify it.")
+                } {
+                    _t("You can change these at any point.")
+                }
+            </p>
+
+            <SpaceBasicSettings setAvatar={setAvatar} name={name} setName={setName} topic={topic} setTopic={setTopic} />
+
+            <FormButton
+                label={busy ? _t("Creating...") : _t("Create")}
+                onClick={onSpaceCreateClick}
+                disabled={!name && !busy}
+            />
+        </React.Fragment>;
+    }
+
+    return <ContextMenu
+        left={72}
+        top={62}
+        chevronOffset={0}
+        chevronFace={ChevronFace.None}
+        onFinished={onFinished}
+        wrapperClassName="mx_SpaceCreateMenu_wrapper"
+        managed={false}
+    >
+        <FocusLock returnFocus={true}>
+            { body }
+        </FocusLock>
+    </ContextMenu>;
+}
+
+export default SpaceCreateMenu;
diff --git a/src/components/views/spaces/SpacePanel.tsx b/src/components/views/spaces/SpacePanel.tsx
index 760181e0e0..48e2c86b2c 100644
--- a/src/components/views/spaces/SpacePanel.tsx
+++ b/src/components/views/spaces/SpacePanel.tsx
@@ -20,6 +20,8 @@ import {Room} from "matrix-js-sdk/src/models/room";
 
 import {_t} from "../../../languageHandler";
 import RoomAvatar from "../avatars/RoomAvatar";
+import {useContextMenu} from "../../structures/ContextMenu";
+import SpaceCreateMenu from "./SpaceCreateMenu";
 import {SpaceItem} from "./SpaceTreeLevel";
 import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
 import {useEventEmitter} from "../../../hooks/useEventEmitter";
@@ -112,9 +114,21 @@ const useSpaces = (): [Room[], Room | null] => {
 };
 
 const SpacePanel = () => {
+    // We don't need the handle as we position the menu in a constant location
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    const [menuDisplayed, handle, openMenu, closeMenu] = useContextMenu<void>();
     const [spaces, activeSpace] = useSpaces();
     const [isPanelCollapsed, setPanelCollapsed] = useState(true);
 
+    const newClasses = classNames("mx_SpaceButton_new", {
+        mx_SpaceButton_newCancel: menuDisplayed,
+    });
+
+    let contextMenu = null;
+    if (menuDisplayed) {
+        contextMenu = <SpaceCreateMenu onFinished={closeMenu} />;
+    }
+
     const onKeyDown = (ev: React.KeyboardEvent) => {
         let handled = true;
 
@@ -203,12 +217,19 @@ const SpacePanel = () => {
                             onExpand={() => setPanelCollapsed(false)}
                         />) }
                     </div>
+                    <SpaceButton
+                        className={newClasses}
+                        tooltip={menuDisplayed ? _t("Cancel") : _t("Create a space")}
+                        onClick={menuDisplayed ? closeMenu : openMenu}
+                        isNarrow={isPanelCollapsed}
+                    />
                 </AutoHideScrollbar>
                 <AccessibleTooltipButton
                     className={classNames("mx_SpacePanel_toggleCollapse", {expanded: !isPanelCollapsed})}
                     onClick={evt => setPanelCollapsed(!isPanelCollapsed)}
                     title={expandCollapseButtonTitle}
                 />
+                { contextMenu }
             </ul>
         )}
     </RovingTabIndexProvider>
diff --git a/src/createRoom.ts b/src/createRoom.ts
index 9e3960cdb7..e773c51290 100644
--- a/src/createRoom.ts
+++ b/src/createRoom.ts
@@ -41,7 +41,7 @@ enum Visibility {
     Private = "private",
 }
 
-enum Preset {
+export enum Preset {
     PrivateChat = "private_chat",
     TrustedPrivateChat = "trusted_private_chat",
     PublicChat = "public_chat",
@@ -54,7 +54,7 @@ interface Invite3PID {
     address: string;
 }
 
-interface IStateEvent {
+export interface IStateEvent {
     type: string;
     state_key?: string; // defaults to an empty string
     content: object;
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 38460a5f6e..1b29e65b40 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -978,11 +978,27 @@
     "From %(deviceName)s (%(deviceId)s)": "From %(deviceName)s (%(deviceId)s)",
     "Decline (%(counter)s)": "Decline (%(counter)s)",
     "Accept <policyLink /> to continue:": "Accept <policyLink /> to continue:",
+    "Delete": "Delete",
+    "Upload": "Upload",
+    "Name": "Name",
+    "Description": "Description",
+    "Create a space": "Create a space",
+    "Organise rooms into spaces, for just you or anyone": "Organise rooms into spaces, for just you or anyone",
+    "Public": "Public",
+    "Open space for anyone, best for communities": "Open space for anyone, best for communities",
+    "Private": "Private",
+    "Invite only space, best for yourself or teams": "Invite only space, best for yourself or teams",
+    "Go back": "Go back",
+    "Personalise your public space": "Personalise your public space",
+    "Personalise your private space": "Personalise your private space",
+    "Give it a photo, name and description to help you identify it.": "Give it a photo, name and description to help you identify it.",
+    "You can change these at any point.": "You can change these at any point.",
+    "Creating...": "Creating...",
+    "Create": "Create",
     "Expand space panel": "Expand space panel",
     "Collapse space panel": "Collapse space panel",
     "Home": "Home",
     "Remove": "Remove",
-    "Upload": "Upload",
     "This bridge was provisioned by <user />.": "This bridge was provisioned by <user />.",
     "This bridge is managed by <user />.": "This bridge is managed by <user />.",
     "Workspace: <networkLink/>": "Workspace: <networkLink/>",
@@ -1136,7 +1152,6 @@
     "Disconnect anyway": "Disconnect anyway",
     "You are still <b>sharing your personal data</b> on the identity server <idserver />.": "You are still <b>sharing your personal data</b> on the identity server <idserver />.",
     "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.",
-    "Go back": "Go back",
     "Identity Server (%(server)s)": "Identity Server (%(server)s)",
     "You are currently using <server></server> to discover and be discoverable by existing contacts you know. You can change your identity server below.": "You are currently using <server></server> to discover and be discoverable by existing contacts you know. You can change your identity server below.",
     "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.",
@@ -2011,7 +2026,6 @@
     "You can change this later if needed.": "You can change this later if needed.",
     "What's the name of your community or team?": "What's the name of your community or team?",
     "Enter name": "Enter name",
-    "Create": "Create",
     "Add image (optional)": "Add image (optional)",
     "An image will help people identify your community.": "An image will help people identify your community.",
     "Community IDs cannot be empty.": "Community IDs cannot be empty.",
@@ -2033,7 +2047,6 @@
     "Create a public room": "Create a public room",
     "Create a private room": "Create a private room",
     "Create a room in %(communityName)s": "Create a room in %(communityName)s",
-    "Name": "Name",
     "Topic (optional)": "Topic (optional)",
     "Make this room public": "Make this room public",
     "Block anyone not part of %(serverName)s from ever joining this room.": "Block anyone not part of %(serverName)s from ever joining this room.",
@@ -2456,7 +2469,6 @@
     "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!": "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!",
     "Long Description (HTML)": "Long Description (HTML)",
     "Upload avatar": "Upload avatar",
-    "Description": "Description",
     "Community %(groupId)s not found": "Community %(groupId)s not found",
     "This homeserver does not support communities": "This homeserver does not support communities",
     "Failed to load %(groupId)s": "Failed to load %(groupId)s",

From c8fe3f76765108869e85a4b0140461210c0f5eff Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 1 Mar 2021 17:54:53 +0000
Subject: [PATCH 116/420] Pass room creation opts for new rooms into RoomView

---
 src/components/structures/LoggedInView.tsx | 3 +++
 src/components/structures/MatrixChat.tsx   | 6 +++++-
 src/components/structures/RoomView.tsx     | 3 +++
 src/createRoom.ts                          | 6 +++++-
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx
index c01214f3f4..1694b4bcf5 100644
--- a/src/components/structures/LoggedInView.tsx
+++ b/src/components/structures/LoggedInView.tsx
@@ -55,6 +55,7 @@ import { IThreepidInvite } from "../../stores/ThreepidInviteStore";
 import Modal from "../../Modal";
 import { ICollapseConfig } from "../../resizer/distributors/collapse";
 import HostSignupContainer from '../views/host_signup/HostSignupContainer';
+import { IOpts } from "../../createRoom";
 
 // 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.
@@ -91,6 +92,7 @@ interface IProps {
     currentGroupId?: string;
     currentGroupIsNew?: boolean;
     justRegistered?: boolean;
+    roomJustCreatedOpts?: IOpts;
 }
 
 interface IUsageLimit {
@@ -619,6 +621,7 @@ class LoggedInView extends React.Component<IProps, IState> {
                     viaServers={this.props.viaServers}
                     key={this.props.currentRoomId || 'roomview'}
                     resizeNotifier={this.props.resizeNotifier}
+                    justCreatedOpts={this.props.roomJustCreatedOpts}
                 />;
                 break;
 
diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index 5045e44182..8e3d3e6b5f 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -48,7 +48,7 @@ import * as Lifecycle from '../../Lifecycle';
 import '../../stores/LifecycleStore';
 import PageTypes from '../../PageTypes';
 
-import createRoom from "../../createRoom";
+import createRoom, {IOpts} from "../../createRoom";
 import {_t, _td, getCurrentLanguage} from '../../languageHandler';
 import SettingsStore from "../../settings/SettingsStore";
 import ThemeController from "../../settings/controllers/ThemeController";
@@ -144,6 +144,8 @@ interface IRoomInfo {
     oob_data?: object;
     via_servers?: string[];
     threepid_invite?: IThreepidInvite;
+
+    justCreatedOpts?: IOpts;
 }
 /* eslint-enable camelcase */
 
@@ -201,6 +203,7 @@ interface IState {
     viaServers?: string[];
     pendingInitialSync?: boolean;
     justRegistered?: boolean;
+    roomJustCreatedOpts?: IOpts;
 }
 
 export default class MatrixChat extends React.PureComponent<IProps, IState> {
@@ -922,6 +925,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 roomOobData: roomInfo.oob_data,
                 viaServers: roomInfo.via_servers,
                 ready: true,
+                roomJustCreatedOpts: roomInfo.justCreatedOpts,
             }, () => {
                 this.notifyNewScreen('room/' + presentedId, replaceLast);
             });
diff --git a/src/components/structures/RoomView.tsx b/src/components/structures/RoomView.tsx
index 6c8560f42c..933514754c 100644
--- a/src/components/structures/RoomView.tsx
+++ b/src/components/structures/RoomView.tsx
@@ -80,6 +80,8 @@ import { showToast as showNotificationsToast } from "../../toasts/DesktopNotific
 import { RoomNotificationStateStore } from "../../stores/notifications/RoomNotificationStateStore";
 import { Container, WidgetLayoutStore } from "../../stores/widgets/WidgetLayoutStore";
 import { objectHasDiff } from "../../utils/objects";
+import SpaceRoomView from "./SpaceRoomView";
+import { IOpts } from "../../createRoom";
 
 const DEBUG = false;
 let debuglog = function(msg: string) {};
@@ -114,6 +116,7 @@ interface IProps {
 
     autoJoin?: boolean;
     resizeNotifier: ResizeNotifier;
+    justCreatedOpts?: IOpts;
 
     // Called with the credentials of a registered user (if they were a ROU that transitioned to PWLU)
     onRegistered?(credentials: IMatrixClientCreds): void;
diff --git a/src/createRoom.ts b/src/createRoom.ts
index e773c51290..00a970eedc 100644
--- a/src/createRoom.ts
+++ b/src/createRoom.ts
@@ -75,7 +75,7 @@ interface ICreateOpts {
     power_level_content_override?: object;
 }
 
-interface IOpts {
+export interface IOpts {
     dmUserId?: string;
     createOpts?: ICreateOpts;
     spinner?: boolean;
@@ -197,6 +197,9 @@ export default function createRoom(opts: IOpts): Promise<string | null> {
         // room has been created, so we race here with the client knowing that
         // the room exists, causing things like
         // https://github.com/vector-im/vector-web/issues/1813
+        // Even if we were to block on the echo, servers tend to split the room
+        // state over multiple syncs so we can't atomically know when we have the
+        // entire thing.
         if (opts.andView) {
             dis.dispatch({
                 action: 'view_room',
@@ -206,6 +209,7 @@ export default function createRoom(opts: IOpts): Promise<string | null> {
                 // so we are expecting the room to come down the sync
                 // stream, if it hasn't already.
                 joining: true,
+                justCreatedOpts: opts,
             });
         }
         CountlyAnalytics.instance.trackRoomCreate(startTime, roomId);

From c10512fd569021089c34a8ea2b6083d0996f02b3 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 1 Mar 2021 18:10:17 +0000
Subject: [PATCH 117/420] Initial SpaceRoomView work

---
 res/css/_components.scss                      |   2 +
 res/css/structures/_SpaceRoomView.scss        | 244 +++++++++
 res/css/views/spaces/_SpacePublicShare.scss   |  60 +++
 res/img/element-icons/link.svg                |   3 +
 res/themes/dark/css/_dark.scss                |   1 +
 res/themes/legacy-dark/css/_legacy-dark.scss  |   1 +
 .../legacy-light/css/_legacy-light.scss       |   1 +
 res/themes/light/css/_light.scss              |   1 +
 src/RoomInvite.js                             |   9 +-
 src/components/structures/RightPanel.js       |  23 +-
 src/components/structures/RoomView.tsx        |  20 +-
 src/components/structures/SpaceRoomView.tsx   | 503 ++++++++++++++++++
 src/components/views/dialogs/InviteDialog.tsx |  66 ++-
 .../views/spaces/SpacePublicShare.tsx         |  65 +++
 .../payloads/SetRightPanelPhasePayload.ts     |   2 +
 src/hooks/useStateArray.ts                    |  29 +
 src/i18n/strings/en_EN.json                   |  41 +-
 src/stores/RightPanelStorePhases.ts           |  12 +
 src/utils/space.ts                            |  28 +
 19 files changed, 1066 insertions(+), 45 deletions(-)
 create mode 100644 res/css/structures/_SpaceRoomView.scss
 create mode 100644 res/css/views/spaces/_SpacePublicShare.scss
 create mode 100644 res/img/element-icons/link.svg
 create mode 100644 src/components/structures/SpaceRoomView.tsx
 create mode 100644 src/components/views/spaces/SpacePublicShare.tsx
 create mode 100644 src/hooks/useStateArray.ts
 create mode 100644 src/utils/space.ts

diff --git a/res/css/_components.scss b/res/css/_components.scss
index 8d6597aefa..ca66aa60ec 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -28,6 +28,7 @@
 @import "./structures/_ScrollPanel.scss";
 @import "./structures/_SearchBox.scss";
 @import "./structures/_SpacePanel.scss";
+@import "./structures/_SpaceRoomView.scss";
 @import "./structures/_TabbedView.scss";
 @import "./structures/_ToastContainer.scss";
 @import "./structures/_UploadBar.scss";
@@ -235,6 +236,7 @@
 @import "./views/settings/tabs/user/_VoiceUserSettingsTab.scss";
 @import "./views/spaces/_SpaceBasicSettings.scss";
 @import "./views/spaces/_SpaceCreateMenu.scss";
+@import "./views/spaces/_SpacePublicShare.scss";
 @import "./views/terms/_InlineTermsAgreement.scss";
 @import "./views/toasts/_AnalyticsToast.scss";
 @import "./views/toasts/_NonUrgentEchoFailureToast.scss";
diff --git a/res/css/structures/_SpaceRoomView.scss b/res/css/structures/_SpaceRoomView.scss
new file mode 100644
index 0000000000..559f405e59
--- /dev/null
+++ b/res/css/structures/_SpaceRoomView.scss
@@ -0,0 +1,244 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.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.
+*/
+
+$SpaceRoomViewInnerWidth: 428px;
+
+.mx_SpaceRoomView {
+    .mx_MainSplit > div:first-child {
+        padding: 80px 60px;
+        flex-grow: 1;
+
+        h1 {
+            margin: 0;
+            font-size: $font-24px;
+            font-weight: $font-semi-bold;
+            color: $primary-fg-color;
+            width: max-content;
+        }
+
+        .mx_SpaceRoomView_description {
+            font-size: $font-15px;
+            color: $secondary-fg-color;
+            margin-top: 12px;
+            margin-bottom: 24px;
+        }
+
+        .mx_SpaceRoomView_buttons {
+            display: block;
+            margin-top: 44px;
+            width: $SpaceRoomViewInnerWidth;
+            text-align: right; // button alignment right
+
+            .mx_FormButton {
+                padding: 8px 22px;
+                margin-left: 16px;
+            }
+        }
+
+        .mx_Field {
+            max-width: $SpaceRoomViewInnerWidth;
+
+            & + .mx_Field {
+                margin-top: 28px;
+            }
+        }
+
+        .mx_SpaceRoomView_errorText {
+            font-weight: $font-semi-bold;
+            font-size: $font-12px;
+            line-height: $font-15px;
+            color: $notice-primary-color;
+            margin-bottom: 28px;
+        }
+
+        .mx_AccessibleButton_disabled {
+            cursor: not-allowed;
+        }
+    }
+
+    .mx_SpaceRoomView_landing {
+        overflow-y: auto;
+
+        > .mx_BaseAvatar_image,
+        > .mx_BaseAvatar > .mx_BaseAvatar_image {
+            border-radius: 12px;
+        }
+
+        .mx_SpaceRoomView_landing_name {
+            margin: 24px 0 16px;
+            font-size: $font-15px;
+            color: $secondary-fg-color;
+
+            > span {
+                display: inline-block;
+            }
+
+            .mx_SpaceRoomView_landing_nameRow {
+                margin-top: 12px;
+
+                > h1 {
+                    display: inline-block;
+                }
+            }
+
+            .mx_SpaceRoomView_landing_inviter {
+                .mx_BaseAvatar {
+                    margin-right: 4px;
+                    vertical-align: middle;
+                }
+            }
+
+            .mx_SpaceRoomView_landing_memberCount {
+                position: relative;
+                margin-left: 24px;
+                padding: 0 0 0 28px;
+                line-height: $font-24px;
+                vertical-align: text-bottom;
+
+                &::before {
+                    position: absolute;
+                    content: '';
+                    width: 24px;
+                    height: 24px;
+                    top: 0;
+                    left: 0;
+                    mask-position: center;
+                    mask-repeat: no-repeat;
+                    mask-size: contain;
+                    background-color: $accent-color;
+                    mask-image: url('$(res)/img/element-icons/community-members.svg');
+                }
+            }
+        }
+
+        .mx_SpaceRoomView_landing_topic {
+            font-size: $font-15px;
+        }
+
+        .mx_SpaceRoomView_landing_joinButtons {
+            margin-top: 24px;
+
+            .mx_FormButton {
+                padding: 8px 22px;
+            }
+        }
+    }
+
+    .mx_SpaceRoomView_privateScope {
+        .mx_RadioButton {
+            width: $SpaceRoomViewInnerWidth;
+            border-radius: 8px;
+            border: 1px solid $space-button-outline-color;
+            padding: 16px 16px 16px 72px;
+            margin-top: 36px;
+            cursor: pointer;
+            box-sizing: border-box;
+            position: relative;
+
+            > div:first-of-type {
+                // hide radio dot
+                display: none;
+            }
+
+            .mx_RadioButton_content {
+                margin: 0;
+
+                > h3 {
+                    margin: 0 0 4px;
+                    font-size: $font-15px;
+                    font-weight: $font-semi-bold;
+                    line-height: $font-18px;
+                }
+
+                > div {
+                    color: $secondary-fg-color;
+                    font-size: $font-15px;
+                    line-height: $font-24px;
+                }
+            }
+
+            &::before {
+                content: "";
+                position: absolute;
+                height: 32px;
+                width: 32px;
+                top: 24px;
+                left: 20px;
+                background-color: $secondary-fg-color;
+                mask-repeat: no-repeat;
+                mask-position: center;
+                mask-size: contain;
+            }
+        }
+
+        .mx_RadioButton_checked {
+            border-color: $accent-color;
+
+            .mx_RadioButton_content {
+                > div {
+                    color: $primary-fg-color;
+                }
+            }
+
+            &::before {
+                background-color: $accent-color;
+            }
+        }
+
+        .mx_SpaceRoomView_privateScope_justMeButton::before {
+            mask-image: url('$(res)/img/element-icons/room/members.svg');
+        }
+
+        .mx_SpaceRoomView_privateScope_meAndMyTeammatesButton::before {
+            mask-image: url('$(res)/img/element-icons/community-members.svg');
+        }
+    }
+
+    .mx_SpaceRoomView_inviteTeammates {
+        .mx_SpaceRoomView_inviteTeammates_buttons {
+            color: $secondary-fg-color;
+            margin-top: 28px;
+
+            .mx_AccessibleButton {
+                position: relative;
+                display: inline-block;
+                padding-left: 32px;
+                line-height: 24px; // to center icons
+
+                &::before {
+                    content: "";
+                    position: absolute;
+                    height: 24px;
+                    width: 24px;
+                    top: 0;
+                    left: 0;
+                    background-color: $secondary-fg-color;
+                    mask-repeat: no-repeat;
+                    mask-position: center;
+                    mask-size: contain;
+                }
+
+                & + .mx_AccessibleButton {
+                    margin-left: 32px;
+                }
+            }
+
+            .mx_SpaceRoomView_inviteTeammates_inviteDialogButton::before {
+                mask-image: url('$(res)/img/element-icons/room/invite.svg');
+            }
+        }
+    }
+}
diff --git a/res/css/views/spaces/_SpacePublicShare.scss b/res/css/views/spaces/_SpacePublicShare.scss
new file mode 100644
index 0000000000..9ba0549ae3
--- /dev/null
+++ b/res/css/views/spaces/_SpacePublicShare.scss
@@ -0,0 +1,60 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.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_SpacePublicShare {
+    .mx_AccessibleButton {
+        border: 1px solid $space-button-outline-color;
+        box-sizing: border-box;
+        border-radius: 8px;
+        padding: 12px 24px 12px 52px;
+        margin-top: 16px;
+        width: $SpaceRoomViewInnerWidth;
+        font-size: $font-15px;
+        line-height: $font-24px;
+        position: relative;
+        display: flex;
+
+        > span {
+            color: #368bd6;
+            margin-left: auto;
+        }
+
+        &:hover {
+            background-color: rgba(141, 151, 165, 0.1);
+        }
+
+        &::before {
+            content: "";
+            position: absolute;
+            width: 30px;
+            height: 30px;
+            mask-repeat: no-repeat;
+            mask-size: contain;
+            mask-position: center;
+            background: $muted-fg-color;
+            left: 12px;
+            top: 9px;
+        }
+
+        &.mx_SpacePublicShare_shareButton::before {
+            mask-image: url('$(res)/img/element-icons/link.svg');
+        }
+
+        &.mx_SpacePublicShare_inviteButton::before {
+            mask-image: url('$(res)/img/element-icons/room/invite.svg');
+        }
+    }
+}
diff --git a/res/img/element-icons/link.svg b/res/img/element-icons/link.svg
new file mode 100644
index 0000000000..ab3d54b838
--- /dev/null
+++ b/res/img/element-icons/link.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.5285 6.54089L13.0273 6.04207C14.4052 4.66426 16.6259 4.65104 17.9874 6.01253C19.349 7.37402 19.3357 9.59466 17.9579 10.9725L15.5878 13.3425C14.21 14.7203 11.9893 14.7335 10.6277 13.372M11.4717 17.4589L10.9727 17.9579C9.59481 19.3357 7.37409 19.349 6.01256 17.9875C4.65102 16.626 4.66426 14.4053 6.04211 13.0275L8.41203 10.6577C9.78988 9.27988 12.0106 9.26665 13.3721 10.6281" stroke="black" stroke-width="2" stroke-linecap="round"/>
+</svg>
diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss
index a878aa3cdd..0de5e69782 100644
--- a/res/themes/dark/css/_dark.scss
+++ b/res/themes/dark/css/_dark.scss
@@ -123,6 +123,7 @@ $roomsublist-divider-color: $primary-fg-color;
 $roomsublist-skeleton-ui-bg: linear-gradient(180deg, #3e444c 0%, #3e444c00 100%);
 
 $groupFilterPanel-divider-color: $roomlist-header-color;
+$space-button-outline-color: rgba(141, 151, 165, 0.2);
 
 $roomtile-preview-color: $secondary-fg-color;
 $roomtile-default-badge-bg-color: #61708b;
diff --git a/res/themes/legacy-dark/css/_legacy-dark.scss b/res/themes/legacy-dark/css/_legacy-dark.scss
index 3e3c299af9..8c5f20178b 100644
--- a/res/themes/legacy-dark/css/_legacy-dark.scss
+++ b/res/themes/legacy-dark/css/_legacy-dark.scss
@@ -120,6 +120,7 @@ $roomsublist-divider-color: $primary-fg-color;
 $roomsublist-skeleton-ui-bg: linear-gradient(180deg, #3e444c 0%, #3e444c00 100%);
 
 $groupFilterPanel-divider-color: $roomlist-header-color;
+$space-button-outline-color: rgba(141, 151, 165, 0.2);
 
 $roomtile-preview-color: #9e9e9e;
 $roomtile-default-badge-bg-color: #61708b;
diff --git a/res/themes/legacy-light/css/_legacy-light.scss b/res/themes/legacy-light/css/_legacy-light.scss
index a740ba155c..3ba10a68ea 100644
--- a/res/themes/legacy-light/css/_legacy-light.scss
+++ b/res/themes/legacy-light/css/_legacy-light.scss
@@ -187,6 +187,7 @@ $roomsublist-divider-color: $primary-fg-color;
 $roomsublist-skeleton-ui-bg: linear-gradient(180deg, #ffffff 0%, #ffffff00 100%);
 
 $groupFilterPanel-divider-color: $roomlist-header-color;
+$space-button-outline-color: #E3E8F0;
 
 $roomtile-preview-color: #9e9e9e;
 $roomtile-default-badge-bg-color: #61708b;
diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss
index 1c89d83c01..76bf2ddc21 100644
--- a/res/themes/light/css/_light.scss
+++ b/res/themes/light/css/_light.scss
@@ -181,6 +181,7 @@ $roomsublist-divider-color: $primary-fg-color;
 $roomsublist-skeleton-ui-bg: linear-gradient(180deg, #ffffff 0%, #ffffff00 100%);
 
 $groupFilterPanel-divider-color: $roomlist-header-color;
+$space-button-outline-color: #E3E8F0;
 
 $roomtile-preview-color: $secondary-fg-color;
 $roomtile-default-badge-bg-color: #61708b;
diff --git a/src/RoomInvite.js b/src/RoomInvite.js
index 06d3fb04e8..728ae11e79 100644
--- a/src/RoomInvite.js
+++ b/src/RoomInvite.js
@@ -22,7 +22,7 @@ import MultiInviter from './utils/MultiInviter';
 import Modal from './Modal';
 import * as sdk from './';
 import { _t } from './languageHandler';
-import {KIND_DM, KIND_INVITE} from "./components/views/dialogs/InviteDialog";
+import InviteDialog, {KIND_DM, KIND_INVITE, KIND_SPACE_INVITE} from "./components/views/dialogs/InviteDialog";
 import CommunityPrototypeInviteDialog from "./components/views/dialogs/CommunityPrototypeInviteDialog";
 import {CommunityPrototypeStore} from "./stores/CommunityPrototypeStore";
 
@@ -75,6 +75,13 @@ export function showCommunityInviteDialog(communityId) {
     }
 }
 
+export const showSpaceInviteDialog = (roomId) => {
+    Modal.createTrackedDialog("Invite Users", "Space", InviteDialog, {
+        kind: KIND_SPACE_INVITE,
+        roomId,
+    }, /*className=*/null, /*isPriority=*/false, /*isStatic=*/true);
+};
+
 /**
  * Checks if the given MatrixEvent is a valid 3rd party user invite.
  * @param {MatrixEvent} event The event to check
diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index d66049d3a5..3d9df2e927 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -24,7 +24,11 @@ import dis from '../../dispatcher/dispatcher';
 import RateLimitedFunc from '../../ratelimitedfunc';
 import { showGroupInviteDialog, showGroupAddRoomDialog } from '../../GroupAddressPicker';
 import GroupStore from '../../stores/GroupStore';
-import {RightPanelPhases, RIGHT_PANEL_PHASES_NO_ARGS} from "../../stores/RightPanelStorePhases";
+import {
+    RightPanelPhases,
+    RIGHT_PANEL_PHASES_NO_ARGS,
+    RIGHT_PANEL_SPACE_PHASES,
+} from "../../stores/RightPanelStorePhases";
 import RightPanelStore from "../../stores/RightPanelStore";
 import MatrixClientContext from "../../contexts/MatrixClientContext";
 import {Action} from "../../dispatcher/actions";
@@ -79,6 +83,8 @@ export default class RightPanel extends React.Component {
                 return RightPanelPhases.GroupMemberList;
             }
             return rps.groupPanelPhase;
+        } else if (this.props.room?.isSpaceRoom() && !RIGHT_PANEL_SPACE_PHASES.includes(rps.roomPanelPhase)) {
+            return RightPanelPhases.SpaceMemberList;
         } else if (userForPanel) {
             // XXX FIXME AAAAAARGH: What is going on with this class!? It takes some of its state
             // from its props and some from a store, except if the contents of the store changes
@@ -99,9 +105,8 @@ export default class RightPanel extends React.Component {
                 return rps.roomPanelPhase;
             }
             return RightPanelPhases.RoomMemberInfo;
-        } else {
-            return rps.roomPanelPhase;
         }
+        return rps.roomPanelPhase;
     }
 
     componentDidMount() {
@@ -181,6 +186,7 @@ export default class RightPanel extends React.Component {
                 verificationRequest: payload.verificationRequest,
                 verificationRequestPromise: payload.verificationRequestPromise,
                 widgetId: payload.widgetId,
+                space: payload.space,
             });
         }
     }
@@ -232,6 +238,13 @@ export default class RightPanel extends React.Component {
                     panel = <MemberList roomId={roomId} key={roomId} onClose={this.onClose} />;
                 }
                 break;
+            case RightPanelPhases.SpaceMemberList:
+                panel = <MemberList
+                    roomId={this.state.space ? this.state.space.roomId : roomId}
+                    key={this.state.space ? this.state.space.roomId : roomId}
+                    onClose={this.onClose}
+                />;
+                break;
 
             case RightPanelPhases.GroupMemberList:
                 if (this.props.groupId) {
@@ -244,10 +257,11 @@ export default class RightPanel extends React.Component {
                 break;
 
             case RightPanelPhases.RoomMemberInfo:
+            case RightPanelPhases.SpaceMemberInfo:
             case RightPanelPhases.EncryptionPanel:
                 panel = <UserInfo
                     user={this.state.member}
-                    room={this.props.room}
+                    room={this.state.phase === RightPanelPhases.SpaceMemberInfo ? this.state.space : this.props.room}
                     key={roomId || this.state.member.userId}
                     onClose={this.onClose}
                     phase={this.state.phase}
@@ -257,6 +271,7 @@ export default class RightPanel extends React.Component {
                 break;
 
             case RightPanelPhases.Room3pidMemberInfo:
+            case RightPanelPhases.Space3pidMemberInfo:
                 panel = <ThirdPartyMemberInfo event={this.state.event} key={roomId} />;
                 break;
 
diff --git a/src/components/structures/RoomView.tsx b/src/components/structures/RoomView.tsx
index 933514754c..1961779d0e 100644
--- a/src/components/structures/RoomView.tsx
+++ b/src/components/structures/RoomView.tsx
@@ -1400,7 +1400,7 @@ export default class RoomView extends React.Component<IProps, IState> {
         });
     };
 
-    private onRejectButtonClicked = ev => {
+    private onRejectButtonClicked = () => {
         this.setState({
             rejecting: true,
         });
@@ -1460,7 +1460,7 @@ export default class RoomView extends React.Component<IProps, IState> {
         }
     };
 
-    private onRejectThreepidInviteButtonClicked = ev => {
+    private onRejectThreepidInviteButtonClicked = () => {
         // We can reject 3pid invites in the same way that we accept them,
         // using /leave rather than /join. In the short term though, we
         // just ignore them.
@@ -1723,7 +1723,7 @@ export default class RoomView extends React.Component<IProps, IState> {
         }
 
         const myMembership = this.state.room.getMyMembership();
-        if (myMembership == 'invite') {
+        if (myMembership === "invite" && !this.state.room.isSpaceRoom()) { // SpaceRoomView handles invites itself
             if (this.state.joining || this.state.rejecting) {
                 return (
                     <ErrorBoundary>
@@ -1852,7 +1852,7 @@ export default class RoomView extends React.Component<IProps, IState> {
                     room={this.state.room}
                 />
             );
-            if (!this.state.canPeek) {
+            if (!this.state.canPeek && !this.state.room?.isSpaceRoom()) {
                 return (
                     <div className="mx_RoomView">
                         { previewBar }
@@ -1874,6 +1874,18 @@ export default class RoomView extends React.Component<IProps, IState> {
             );
         }
 
+        if (this.state.room?.isSpaceRoom()) {
+            return <SpaceRoomView
+                space={this.state.room}
+                justCreatedOpts={this.props.justCreatedOpts}
+                resizeNotifier={this.props.resizeNotifier}
+                onJoinButtonClicked={this.onJoinButtonClicked}
+                onRejectButtonClicked={this.props.threepidInvite
+                    ? this.onRejectThreepidInviteButtonClicked
+                    : this.onRejectButtonClicked}
+            />;
+        }
+
         const auxPanel = (
             <AuxPanel
                 room={this.state.room}
diff --git a/src/components/structures/SpaceRoomView.tsx b/src/components/structures/SpaceRoomView.tsx
new file mode 100644
index 0000000000..6c64df31eb
--- /dev/null
+++ b/src/components/structures/SpaceRoomView.tsx
@@ -0,0 +1,503 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.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, {RefObject, useContext, useRef, useState} from "react";
+import {EventType} from "matrix-js-sdk/src/@types/event";
+import {Room} from "matrix-js-sdk/src/models/room";
+
+import MatrixClientContext from "../../contexts/MatrixClientContext";
+import RoomAvatar from "../views/avatars/RoomAvatar";
+import {_t} from "../../languageHandler";
+import AccessibleButton from "../views/elements/AccessibleButton";
+import RoomName from "../views/elements/RoomName";
+import RoomTopic from "../views/elements/RoomTopic";
+import FormButton from "../views/elements/FormButton";
+import {inviteMultipleToRoom, showSpaceInviteDialog} from "../../RoomInvite";
+import {useRoomMembers} from "../../hooks/useRoomMembers";
+import createRoom, {IOpts, Preset} from "../../createRoom";
+import Field from "../views/elements/Field";
+import {useEventEmitter} from "../../hooks/useEventEmitter";
+import StyledRadioGroup from "../views/elements/StyledRadioGroup";
+import withValidation from "../views/elements/Validation";
+import * as Email from "../../email";
+import defaultDispatcher from "../../dispatcher/dispatcher";
+import {Action} from "../../dispatcher/actions";
+import ResizeNotifier from "../../utils/ResizeNotifier"
+import MainSplit from './MainSplit';
+import ErrorBoundary from "../views/elements/ErrorBoundary";
+import {ActionPayload} from "../../dispatcher/payloads";
+import RightPanel from "./RightPanel";
+import RightPanelStore from "../../stores/RightPanelStore";
+import {EventSubscription} from "fbemitter";
+import {RightPanelPhases} from "../../stores/RightPanelStorePhases";
+import {SetRightPanelPhasePayload} from "../../dispatcher/payloads/SetRightPanelPhasePayload";
+import {useStateArray} from "../../hooks/useStateArray";
+import SpacePublicShare from "../views/spaces/SpacePublicShare";
+import {shouldShowSpaceSettings} from "../../utils/space";
+import MemberAvatar from "../views/avatars/MemberAvatar";
+
+interface IProps {
+    space: Room;
+    justCreatedOpts?: IOpts;
+    resizeNotifier: ResizeNotifier;
+    onJoinButtonClicked(): void;
+    onRejectButtonClicked(): void;
+}
+
+interface IState {
+    phase: Phase;
+    showRightPanel: boolean;
+}
+
+enum Phase {
+    Landing,
+    PublicCreateRooms,
+    PublicShare,
+    PrivateScope,
+    PrivateInvite,
+    PrivateCreateRooms,
+    PrivateExistingRooms,
+}
+
+const RoomMemberCount = ({ room, children }) => {
+    const members = useRoomMembers(room);
+    const count = members.length;
+
+    if (children) return children(count);
+    return count;
+};
+
+const useMyRoomMembership = (room: Room) => {
+    const [membership, setMembership] = useState(room.getMyMembership());
+    useEventEmitter(room, "Room.myMembership", () => {
+        setMembership(room.getMyMembership());
+    });
+    return membership;
+};
+
+const SpaceLanding = ({ space, onJoinButtonClicked, onRejectButtonClicked }) => {
+    const cli = useContext(MatrixClientContext);
+    const myMembership = useMyRoomMembership(space);
+    const joinRule = space.getJoinRule();
+    const userId = cli.getUserId();
+
+    let joinButtons;
+    if (myMembership === "invite") {
+        joinButtons = <div className="mx_SpaceRoomView_landing_joinButtons">
+            <FormButton label={_t("Accept Invite")} onClick={onJoinButtonClicked} />
+            <AccessibleButton kind="link" onClick={onRejectButtonClicked}>
+                {_t("Decline")}
+            </AccessibleButton>
+        </div>;
+    } else if (myMembership !== "join" && joinRule === "public") {
+        joinButtons = <div className="mx_SpaceRoomView_landing_joinButtons">
+            <FormButton label={_t("Join")} onClick={onJoinButtonClicked} />
+        </div>;
+    }
+
+    return <div className="mx_SpaceRoomView_landing">
+        <RoomAvatar room={space} height={80} width={80} viewAvatarOnClick={true} />
+        <div className="mx_SpaceRoomView_landing_name">
+            <RoomName room={space}>
+                {(name) => {
+                    const tags = { name: () => <div className="mx_SpaceRoomView_landing_nameRow">
+                        <h1>{ name }</h1>
+                        <RoomMemberCount room={space}>
+                            {(count) => count > 0 ? (
+                                <AccessibleButton
+                                    className="mx_SpaceRoomView_landing_memberCount"
+                                    kind="link"
+                                    onClick={() => {
+                                        defaultDispatcher.dispatch<SetRightPanelPhasePayload>({
+                                            action: Action.SetRightPanelPhase,
+                                            phase: RightPanelPhases.RoomMemberList,
+                                            refireParams: { space },
+                                        });
+                                    }}
+                                >
+                                    { _t("%(count)s members", { count }) }
+                                </AccessibleButton>
+                            ) : null}
+                        </RoomMemberCount>
+                    </div> };
+                    if (myMembership === "invite") {
+                        const inviteSender = space.getMember(userId)?.events.member?.getSender();
+                        const inviter = inviteSender && space.getMember(inviteSender);
+
+                        if (inviteSender) {
+                            return _t("<inviter/> invited you to <name/>", {}, {
+                                name: tags.name,
+                                inviter: () => inviter
+                                    ? <span className="mx_SpaceRoomView_landing_inviter">
+                                        <MemberAvatar member={inviter} width={26} height={26} viewUserOnClick={true} />
+                                        { inviter.name }
+                                    </span>
+                                    : <span className="mx_SpaceRoomView_landing_inviter">
+                                        { inviteSender }
+                                    </span>,
+                            }) as JSX.Element;
+                        } else {
+                            return _t("You have been invited to <name/>", {}, tags) as JSX.Element;
+                        }
+                    } else if (shouldShowSpaceSettings(cli, space)) {
+                        if (space.getJoinRule() === "public") {
+                            return _t("Your public space <name/>", {}, tags) as JSX.Element;
+                        } else {
+                            return _t("Your private space <name/>", {}, tags) as JSX.Element;
+                        }
+                    }
+                    return _t("Welcome to <name/>", {}, tags) as JSX.Element;
+                }}
+            </RoomName>
+        </div>
+        <div className="mx_SpaceRoomView_landing_topic">
+            <RoomTopic room={space} />
+        </div>
+        { joinButtons }
+    </div>;
+};
+
+const SpaceSetupFirstRooms = ({ space, title, description, onFinished }) => {
+    const [busy, setBusy] = useState(false);
+    const [error, setError] = useState("");
+    const numFields = 3;
+    const placeholders = [_t("General"), _t("Random"), _t("Support")];
+    // TODO vary default prefills for "Just Me" spaces
+    const [roomNames, setRoomName] = useStateArray(numFields, [_t("General"), _t("Random"), ""]);
+    const fields = new Array(numFields).fill(0).map((_, i) => {
+        const name = "roomName" + i;
+        return <Field
+            key={name}
+            name={name}
+            type="text"
+            label={_t("Room name")}
+            placeholder={placeholders[i]}
+            value={roomNames[i]}
+            onChange={ev => setRoomName(i, ev.target.value)}
+        />;
+    });
+
+    const onNextClick = async () => {
+        setError("");
+        setBusy(true);
+        try {
+            await Promise.all(roomNames.map(name => name.trim()).filter(Boolean).map(name => {
+                return createRoom({
+                    createOpts: {
+                        preset: space.getJoinRule() === "public" ? Preset.PublicChat : Preset.PrivateChat,
+                        name,
+                    },
+                    spinner: false,
+                    encryption: false,
+                    andView: false,
+                    inlineErrors: true,
+                    parentSpace: space,
+                });
+            }));
+            onFinished();
+        } catch (e) {
+            console.error("Failed to create initial space rooms", e);
+            setError(_t("Failed to create initial space rooms"));
+        }
+        setBusy(false);
+    };
+
+    let onClick = onFinished;
+    let buttonLabel = _t("Skip for now");
+    if (roomNames.some(name => name.trim())) {
+        onClick = onNextClick;
+        buttonLabel = busy ? _t("Creating rooms...") : _t("Next")
+    }
+
+    return <div>
+        <h1>{ title }</h1>
+        <div className="mx_SpaceRoomView_description">{ description }</div>
+
+        { error && <div className="mx_SpaceRoomView_errorText">{ error }</div> }
+        { fields }
+
+        <div className="mx_SpaceRoomView_buttons">
+            <FormButton
+                label={buttonLabel}
+                disabled={busy}
+                onClick={onClick}
+            />
+        </div>
+    </div>;
+};
+
+const SpaceSetupPublicShare = ({ space, onFinished }) => {
+    return <div className="mx_SpaceRoomView_publicShare">
+        <h1>{ _t("Share your public space") }</h1>
+        <div className="mx_SpacePublicShare_description">{ _t("At the moment only you can see it.") }</div>
+
+        <SpacePublicShare space={space} onFinished={onFinished} />
+
+        <div className="mx_SpaceRoomView_buttons">
+            <FormButton label={_t("Finish")} onClick={onFinished} />
+        </div>
+    </div>;
+};
+
+const SpaceSetupPrivateScope = ({ onFinished }) => {
+    const [option, setOption] = useState<string>(null);
+
+    return <div className="mx_SpaceRoomView_privateScope">
+        <h1>{ _t("Who are you working with?") }</h1>
+        <div className="mx_SpaceRoomView_description">{ _t("Ensure the right people have access to the space.") }</div>
+
+        <StyledRadioGroup
+            name="privateSpaceScope"
+            value={option}
+            onChange={setOption}
+            definitions={[
+                {
+                    value: "justMe",
+                    className: "mx_SpaceRoomView_privateScope_justMeButton",
+                    label: <React.Fragment>
+                        <h3>{ _t("Just Me") }</h3>
+                        <div>{ _t("A private space just for you") }</div>
+                    </React.Fragment>,
+                }, {
+                    value: "meAndMyTeammates",
+                    className: "mx_SpaceRoomView_privateScope_meAndMyTeammatesButton",
+                    label: <React.Fragment>
+                        <h3>{ _t("Me and my teammates") }</h3>
+                        <div>{ _t("A private space for you and your teammates") }</div>
+                    </React.Fragment>,
+                },
+            ]}
+        />
+
+        <div className="mx_SpaceRoomView_buttons">
+            <FormButton label={_t("Next")} disabled={!option} onClick={() => onFinished(option !== "justMe")} />
+        </div>
+    </div>;
+};
+
+const validateEmailRules = withValidation({
+    rules: [{
+        key: "email",
+        test: ({ value }) => !value || Email.looksValid(value),
+        invalid: () => _t("Doesn't look like a valid email address"),
+    }],
+});
+
+const SpaceSetupPrivateInvite = ({ space, onFinished }) => {
+    const [busy, setBusy] = useState(false);
+    const [error, setError] = useState("");
+    const numFields = 3;
+    const fieldRefs: RefObject<Field>[] = [useRef(), useRef(), useRef()];
+    const [emailAddresses, setEmailAddress] = useStateArray(numFields, "");
+    const fields = new Array(numFields).fill(0).map((_, i) => {
+        const name = "emailAddress" + i;
+        return <Field
+            key={name}
+            name={name}
+            type="text"
+            label={_t("Email address")}
+            placeholder={_t("Email")}
+            value={emailAddresses[i]}
+            onChange={ev => setEmailAddress(i, ev.target.value)}
+            ref={fieldRefs[i]}
+            onValidate={validateEmailRules}
+        />;
+    });
+
+    const onNextClick = async () => {
+        setError("");
+        for (let i = 0; i < fieldRefs.length; i++) {
+            const fieldRef = fieldRefs[i];
+            const valid = await fieldRef.current.validate({ allowEmpty: true });
+
+            if (valid === false) { // true/null are allowed
+                fieldRef.current.focus();
+                fieldRef.current.validate({ allowEmpty: true, focused: true });
+                return;
+            }
+        }
+
+        setBusy(true);
+        const targetIds = emailAddresses.map(name => name.trim()).filter(Boolean);
+        try {
+            const result = await inviteMultipleToRoom(space.roomId, targetIds);
+
+            const failedUsers = Object.keys(result.states).filter(a => result.states[a] === "error");
+            if (failedUsers.length > 0) {
+                console.log("Failed to invite users to space: ", result);
+                setError(_t("Failed to invite the following users to your space: %(csvUsers)s", {
+                    csvUsers: failedUsers.join(", "),
+                }));
+            } else {
+                onFinished();
+            }
+        } catch (err) {
+            console.error("Failed to invite users to space: ", err);
+            setError(_t("We couldn't invite those users. Please check the users you want to invite and try again."));
+        }
+        setBusy(false);
+    };
+
+    return <div className="mx_SpaceRoomView_inviteTeammates">
+        <h1>{ _t("Invite your teammates") }</h1>
+        <div className="mx_SpaceRoomView_description">{ _t("Ensure the right people have access to the space.") }</div>
+
+        { error && <div className="mx_SpaceRoomView_errorText">{ error }</div> }
+        { fields }
+
+        <div className="mx_SpaceRoomView_inviteTeammates_buttons">
+            <AccessibleButton
+                className="mx_SpaceRoomView_inviteTeammates_inviteDialogButton"
+                onClick={() => showSpaceInviteDialog(space.roomId)}
+            >
+                { _t("Invite by username") }
+            </AccessibleButton>
+        </div>
+
+        <div className="mx_SpaceRoomView_buttons">
+            <AccessibleButton onClick={onFinished} kind="link">{_t("Skip for now")}</AccessibleButton>
+            <FormButton label={busy ? _t("Inviting...") : _t("Next")} disabled={busy} onClick={onNextClick} />
+        </div>
+    </div>;
+};
+
+export default class SpaceRoomView extends React.PureComponent<IProps, IState> {
+    static contextType = MatrixClientContext;
+
+    private readonly creator: string;
+    private readonly dispatcherRef: string;
+    private readonly rightPanelStoreToken: EventSubscription;
+
+    constructor(props, context) {
+        super(props, context);
+
+        let phase = Phase.Landing;
+
+        this.creator = this.props.space.currentState.getStateEvents(EventType.RoomCreate, "")?.getSender();
+        const showSetup = this.props.justCreatedOpts && this.context.getUserId() === this.creator;
+
+        if (showSetup) {
+            phase = this.props.justCreatedOpts.createOpts.preset === Preset.PublicChat
+                ? Phase.PublicCreateRooms : Phase.PrivateScope;
+        }
+
+        this.state = {
+            phase,
+            showRightPanel: RightPanelStore.getSharedInstance().isOpenForRoom,
+        };
+
+        this.dispatcherRef = defaultDispatcher.register(this.onAction);
+        this.rightPanelStoreToken = RightPanelStore.getSharedInstance().addListener(this.onRightPanelStoreUpdate);
+    }
+
+    componentWillUnmount() {
+        defaultDispatcher.unregister(this.dispatcherRef);
+        this.rightPanelStoreToken.remove();
+    }
+
+    private onRightPanelStoreUpdate = () => {
+        this.setState({
+            showRightPanel: RightPanelStore.getSharedInstance().isOpenForRoom,
+        });
+    };
+
+    private onAction = (payload: ActionPayload) => {
+        if (payload.action !== Action.ViewUser && payload.action !== "view_3pid_invite") return;
+
+        if (payload.action === Action.ViewUser && payload.member) {
+            defaultDispatcher.dispatch<SetRightPanelPhasePayload>({
+                action: Action.SetRightPanelPhase,
+                phase: RightPanelPhases.SpaceMemberInfo,
+                refireParams: {
+                    space: this.props.space,
+                    member: payload.member,
+                },
+            });
+        } else if (payload.action === "view_3pid_invite" && payload.event) {
+            defaultDispatcher.dispatch<SetRightPanelPhasePayload>({
+                action: Action.SetRightPanelPhase,
+                phase: RightPanelPhases.Space3pidMemberInfo,
+                refireParams: {
+                    space: this.props.space,
+                    event: payload.event,
+                },
+            });
+        } else {
+            defaultDispatcher.dispatch<SetRightPanelPhasePayload>({
+                action: Action.SetRightPanelPhase,
+                phase: RightPanelPhases.SpaceMemberList,
+                refireParams: { space: this.props.space },
+            });
+        }
+    };
+
+    private renderBody() {
+        switch (this.state.phase) {
+            case Phase.Landing:
+                return <SpaceLanding
+                    space={this.props.space}
+                    onJoinButtonClicked={this.props.onJoinButtonClicked}
+                    onRejectButtonClicked={this.props.onRejectButtonClicked}
+                />;
+
+            case Phase.PublicCreateRooms:
+                return <SpaceSetupFirstRooms
+                    space={this.props.space}
+                    title={_t("What discussions do you want to have?")}
+                    description={_t("We'll create rooms for each topic.")}
+                    onFinished={() => this.setState({ phase: Phase.PublicShare })}
+                />;
+            case Phase.PublicShare:
+                return <SpaceSetupPublicShare
+                    space={this.props.space}
+                    onFinished={() => this.setState({ phase: Phase.Landing })}
+                />;
+
+            case Phase.PrivateScope:
+                return <SpaceSetupPrivateScope
+                    onFinished={(invite: boolean) => {
+                        this.setState({ phase: invite ? Phase.PrivateInvite : Phase.PrivateCreateRooms });
+                    }}
+                />;
+            case Phase.PrivateInvite:
+                return <SpaceSetupPrivateInvite
+                    space={this.props.space}
+                    onFinished={() => this.setState({ phase: Phase.PrivateCreateRooms })}
+                />;
+            case Phase.PrivateCreateRooms:
+                return <SpaceSetupFirstRooms
+                    space={this.props.space}
+                    title={_t("What projects are you working on?")}
+                    description={_t("We'll create rooms for each of them. You can add existing rooms after setup.")}
+                    onFinished={() => this.setState({ phase: Phase.Landing })}
+                />;
+        }
+    }
+
+    render() {
+        const rightPanel = this.state.showRightPanel && this.state.phase === Phase.Landing
+            ? <RightPanel room={this.props.space} resizeNotifier={this.props.resizeNotifier} />
+            : null;
+
+        return <main className="mx_SpaceRoomView">
+            <ErrorBoundary>
+                <MainSplit panel={rightPanel} resizeNotifier={this.props.resizeNotifier}>
+                    { this.renderBody() }
+                </MainSplit>
+            </ErrorBoundary>
+        </main>;
+    }
+}
diff --git a/src/components/views/dialogs/InviteDialog.tsx b/src/components/views/dialogs/InviteDialog.tsx
index 5b936e822c..9bc5b6476f 100644
--- a/src/components/views/dialogs/InviteDialog.tsx
+++ b/src/components/views/dialogs/InviteDialog.tsx
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import React, {createRef} from 'react';
-import {_t} from "../../../languageHandler";
+import {_t, _td} from "../../../languageHandler";
 import * as sdk from "../../../index";
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import {makeRoomPermalink, makeUserPermalink} from "../../../utils/permalinks/Permalinks";
@@ -48,6 +48,7 @@ import { MatrixCall } from 'matrix-js-sdk/src/webrtc/call';
 
 export const KIND_DM = "dm";
 export const KIND_INVITE = "invite";
+export const KIND_SPACE_INVITE = "space_invite";
 export const KIND_CALL_TRANSFER = "call_transfer";
 
 const INITIAL_ROOMS_SHOWN = 3; // Number of rooms to show at first
@@ -309,7 +310,7 @@ interface IInviteDialogProps {
     // not provided.
     kind: string,
 
-    // The room ID this dialog is for. Only required for KIND_INVITE.
+    // The room ID this dialog is for. Only required for KIND_INVITE and KIND_SPACE_INVITE.
     roomId: string,
 
     // The call to transfer. Only required for KIND_CALL_TRANSFER.
@@ -348,8 +349,8 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
     constructor(props) {
         super(props);
 
-        if (props.kind === KIND_INVITE && !props.roomId) {
-            throw new Error("When using KIND_INVITE a roomId is required for an InviteDialog");
+        if ((props.kind === KIND_INVITE || props.kind === KIND_SPACE_INVITE) && !props.roomId) {
+            throw new Error("When using KIND_INVITE or KIND_SPACE_INVITE a roomId is required for an InviteDialog");
         } else if (props.kind === KIND_CALL_TRANSFER && !props.call) {
             throw new Error("When using KIND_CALL_TRANSFER a call is required for an InviteDialog");
         }
@@ -1026,7 +1027,7 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
             sectionSubname = _t("May include members not in %(communityName)s", {communityName});
         }
 
-        if (this.props.kind === KIND_INVITE) {
+        if (this.props.kind === KIND_INVITE || this.props.kind === KIND_SPACE_INVITE) {
             sectionName = kind === 'recents' ? _t("Recently Direct Messaged") : _t("Suggestions");
         }
 
@@ -1247,38 +1248,35 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
             }
             buttonText = _t("Go");
             goButtonFn = this._startDm;
-        } else if (this.props.kind === KIND_INVITE) {
-            title = _t("Invite to this room");
+        } else if (this.props.kind === KIND_INVITE || this.props.kind === KIND_SPACE_INVITE) {
+            title = this.props.kind === KIND_INVITE ? _t("Invite to this room") : _t("Invite to this space");
 
-            if (identityServersEnabled) {
-                helpText = _t(
-                    "Invite someone using their name, email address, username (like <userId/>) or " +
-                        "<a>share this room</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>,
-                    },
-                );
-            } else {
-                helpText = _t(
-                    "Invite someone using their name, username (like <userId/>) or <a>share this room</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>,
-                    },
-                );
+            let helpTextUntranslated;
+            if (this.props.kind === KIND_INVITE) {
+                if (identityServersEnabled) {
+                    helpTextUntranslated = _td("Invite someone using their name, email address, username " +
+                        "(like <userId/>) or <a>share this room</a>.");
+                } else {
+                    helpTextUntranslated = _td("Invite someone using their name, username " +
+                        "(like <userId/>) or <a>share this room</a>.");
+                }
+            } else { // KIND_SPACE_INVITE
+                if (identityServersEnabled) {
+                    helpTextUntranslated = _td("Invite someone using their name, email address, username " +
+                        "(like <userId/>) or <a>share this space</a>.");
+                } else {
+                    helpTextUntranslated = _td("Invite someone using their name, username " +
+                        "(like <userId/>) or <a>share this space</a>.");
+                }
             }
 
+            helpText = _t(helpTextUntranslated, {}, {
+                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;
         } else if (this.props.kind === KIND_CALL_TRANSFER) {
diff --git a/src/components/views/spaces/SpacePublicShare.tsx b/src/components/views/spaces/SpacePublicShare.tsx
new file mode 100644
index 0000000000..064d1640a2
--- /dev/null
+++ b/src/components/views/spaces/SpacePublicShare.tsx
@@ -0,0 +1,65 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, {useState} from "react";
+import {Room} from "matrix-js-sdk/src/models/room";
+
+import {_t} from "../../../languageHandler";
+import AccessibleButton from "../elements/AccessibleButton";
+import {copyPlaintext} from "../../../utils/strings";
+import {sleep} from "../../../utils/promise";
+import {RoomPermalinkCreator} from "../../../utils/permalinks/Permalinks";
+import {showSpaceInviteDialog} from "../../../RoomInvite";
+
+interface IProps {
+    space: Room;
+    onFinished(): void;
+}
+
+const SpacePublicShare = ({ space, onFinished }: IProps) => {
+    const [copiedText, setCopiedText] = useState(_t("Click to copy"));
+
+    return <div className="mx_SpacePublicShare">
+        <AccessibleButton
+            className="mx_SpacePublicShare_shareButton"
+            onClick={async () => {
+                const permalinkCreator = new RoomPermalinkCreator(space);
+                permalinkCreator.load();
+                const success = await copyPlaintext(permalinkCreator.forRoom());
+                const text = success ? _t("Copied!") : _t("Failed to copy");
+                setCopiedText(text);
+                await sleep(10);
+                if (copiedText === text) { // if the text hasn't changed by another click then clear it after some time
+                    setCopiedText(_t("Click to copy"));
+                }
+            }}
+        >
+            { _t("Share invite link") }
+            <span>{ copiedText }</span>
+        </AccessibleButton>
+        <AccessibleButton
+            className="mx_SpacePublicShare_inviteButton"
+            onClick={() => {
+                showSpaceInviteDialog(space.roomId);
+                onFinished();
+            }}
+        >
+            { _t("Invite by email or username") }
+        </AccessibleButton>
+    </div>;
+};
+
+export default SpacePublicShare;
diff --git a/src/dispatcher/payloads/SetRightPanelPhasePayload.ts b/src/dispatcher/payloads/SetRightPanelPhasePayload.ts
index 4126e8a669..430fad6145 100644
--- a/src/dispatcher/payloads/SetRightPanelPhasePayload.ts
+++ b/src/dispatcher/payloads/SetRightPanelPhasePayload.ts
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import { VerificationRequest } from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
+import { Room } from "matrix-js-sdk/src/models/room";
 import { RoomMember } from "matrix-js-sdk/src/models/room-member";
 import { RightPanelPhases } from "../../stores/RightPanelStorePhases";
 import { ActionPayload } from "../payloads";
@@ -35,4 +36,5 @@ export interface SetRightPanelPhaseRefireParams {
     // XXX: The type for event should 'view_3pid_invite' action's payload
     event?: any;
     widgetId?: string;
+    space?: Room;
 }
diff --git a/src/hooks/useStateArray.ts b/src/hooks/useStateArray.ts
new file mode 100644
index 0000000000..e8ff6efff0
--- /dev/null
+++ b/src/hooks/useStateArray.ts
@@ -0,0 +1,29 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import {useState} from "react";
+
+// Hook to simplify managing state of arrays of a common type
+export const useStateArray = <T>(initialSize: number, initialState: T | T[]): [T[], (i: number, v: T) => void] => {
+    const [data, setData] = useState<T[]>(() => {
+        return Array.isArray(initialState) ? initialState : new Array(initialSize).fill(initialState);
+    });
+    return [data, (index: number, value: T) => setData(data => {
+        const copy = [...data];
+        copy[index] = value;
+        return copy;
+    })]
+};
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 1b29e65b40..ae12b195a0 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -998,6 +998,11 @@
     "Expand space panel": "Expand space panel",
     "Collapse space panel": "Collapse space panel",
     "Home": "Home",
+    "Click to copy": "Click to copy",
+    "Copied!": "Copied!",
+    "Failed to copy": "Failed to copy",
+    "Share invite link": "Share invite link",
+    "Invite by email or username": "Invite by email or username",
     "Remove": "Remove",
     "This bridge was provisioned by <user />.": "This bridge was provisioned by <user />.",
     "This bridge is managed by <user />.": "This bridge is managed by <user />.",
@@ -1814,8 +1819,6 @@
     "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s changed the room avatar to <img/>",
     "Click here to see older messages.": "Click here to see older messages.",
     "This room is a continuation of another conversation.": "This room is a continuation of another conversation.",
-    "Copied!": "Copied!",
-    "Failed to copy": "Failed to copy",
     "Add an Integration": "Add an Integration",
     "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?",
     "Edited at %(date)s": "Edited at %(date)s",
@@ -2164,8 +2167,11 @@
     "Start a conversation with someone using their name or username (like <userId/>).": "Start a conversation with someone using their name or username (like <userId/>).",
     "This won't invite them to %(communityName)s. To invite someone to %(communityName)s, click <a>here</a>": "This won't invite them to %(communityName)s. To invite someone to %(communityName)s, click <a>here</a>",
     "Go": "Go",
+    "Invite to this space": "Invite to this space",
     "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.": "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.",
     "Invite someone using their name, username (like <userId/>) or <a>share this room</a>.": "Invite someone using their name, username (like <userId/>) or <a>share this room</a>.",
+    "Invite someone using their name, email address, username (like <userId/>) or <a>share this space</a>.": "Invite someone using their name, email address, username (like <userId/>) or <a>share this space</a>.",
+    "Invite someone using their name, username (like <userId/>) or <a>share this space</a>.": "Invite someone using their name, username (like <userId/>) or <a>share this space</a>.",
     "Transfer": "Transfer",
     "a new master key signature": "a new master key signature",
     "a new cross-signing key signature": "a new cross-signing key signature",
@@ -2550,6 +2556,37 @@
     "Failed to reject invite": "Failed to reject invite",
     "You have %(count)s unread notifications in a prior version of this room.|other": "You have %(count)s unread notifications in a prior version of this room.",
     "You have %(count)s unread notifications in a prior version of this room.|one": "You have %(count)s unread notification in a prior version of this room.",
+    "Accept Invite": "Accept Invite",
+    "%(count)s members|other": "%(count)s members",
+    "%(count)s members|one": "%(count)s member",
+    "<inviter/> invited you to <name/>": "<inviter/> invited you to <name/>",
+    "You have been invited to <name/>": "You have been invited to <name/>",
+    "Your public space <name/>": "Your public space <name/>",
+    "Your private space <name/>": "Your private space <name/>",
+    "Welcome to <name/>": "Welcome to <name/>",
+    "Random": "Random",
+    "Support": "Support",
+    "Room name": "Room name",
+    "Failed to create initial space rooms": "Failed to create initial space rooms",
+    "Skip for now": "Skip for now",
+    "Creating rooms...": "Creating rooms...",
+    "Share your public space": "Share your public space",
+    "At the moment only you can see it.": "At the moment only you can see it.",
+    "Finish": "Finish",
+    "Who are you working with?": "Who are you working with?",
+    "Ensure the right people have access to the space.": "Ensure the right people have access to the space.",
+    "Just Me": "Just Me",
+    "A private space just for you": "A private space just for you",
+    "Me and my teammates": "Me and my teammates",
+    "A private space for you and your teammates": "A private space for you and your teammates",
+    "Failed to invite the following users to your space: %(csvUsers)s": "Failed to invite the following users to your space: %(csvUsers)s",
+    "Invite your teammates": "Invite your teammates",
+    "Invite by username": "Invite by username",
+    "Inviting...": "Inviting...",
+    "What discussions do you want to have?": "What discussions do you want to have?",
+    "We'll create rooms for each topic.": "We'll create rooms for each topic.",
+    "What projects are you working on?": "What projects are you working on?",
+    "We'll create rooms for each of them. You can add existing rooms after setup.": "We'll create rooms for each of them. You can add existing rooms after setup.",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Tried to load a specific point in this room's timeline, but was unable to find it.",
     "Failed to load timeline position": "Failed to load timeline position",
diff --git a/src/stores/RightPanelStorePhases.ts b/src/stores/RightPanelStorePhases.ts
index 11b51dfc2d..aea78c7460 100644
--- a/src/stores/RightPanelStorePhases.ts
+++ b/src/stores/RightPanelStorePhases.ts
@@ -31,6 +31,11 @@ export enum RightPanelPhases {
     GroupRoomList = 'GroupRoomList',
     GroupRoomInfo = 'GroupRoomInfo',
     GroupMemberInfo = 'GroupMemberInfo',
+
+    // Space stuff
+    SpaceMemberList = "SpaceMemberList",
+    SpaceMemberInfo = "SpaceMemberInfo",
+    Space3pidMemberInfo = "Space3pidMemberInfo",
 }
 
 // These are the phases that are safe to persist (the ones that don't require additional
@@ -43,3 +48,10 @@ export const RIGHT_PANEL_PHASES_NO_ARGS = [
     RightPanelPhases.GroupMemberList,
     RightPanelPhases.GroupRoomList,
 ];
+
+// Subset of phases visible in the Space View
+export const RIGHT_PANEL_SPACE_PHASES = [
+    RightPanelPhases.SpaceMemberList,
+    RightPanelPhases.Space3pidMemberInfo,
+    RightPanelPhases.SpaceMemberInfo,
+];
diff --git a/src/utils/space.ts b/src/utils/space.ts
new file mode 100644
index 0000000000..85faedf5d6
--- /dev/null
+++ b/src/utils/space.ts
@@ -0,0 +1,28 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.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 {MatrixClient} from "matrix-js-sdk/src/client";
+import {EventType} from "matrix-js-sdk/src/@types/event";
+
+export const shouldShowSpaceSettings = (cli: MatrixClient, space: Room) => {
+    const userId = cli.getUserId();
+    return space.getMyMembership() === "join"
+        && (space.currentState.maySendStateEvent(EventType.RoomAvatar, userId)
+            || space.currentState.maySendStateEvent(EventType.RoomName, userId)
+            || space.currentState.maySendStateEvent(EventType.RoomTopic, userId)
+            || space.currentState.maySendStateEvent(EventType.RoomJoinRules, userId));
+};

From 1a7a0e619d72eb3c0ec3f3626ebd802195a27a07 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 1 Mar 2021 19:05:50 +0000
Subject: [PATCH 118/420] extend createRoom for creating rooms in a space

---
 src/createRoom.ts                  | 17 +++++++++++++++++
 src/utils/permalinks/Permalinks.js | 16 ++++++++++++++--
 src/utils/space.ts                 | 11 +++++++++++
 3 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/src/createRoom.ts b/src/createRoom.ts
index 00a970eedc..a5343076ac 100644
--- a/src/createRoom.ts
+++ b/src/createRoom.ts
@@ -17,6 +17,7 @@ limitations under the License.
 
 import { MatrixClient } from "matrix-js-sdk/src/client";
 import { Room } from "matrix-js-sdk/src/models/room";
+import { EventType } from "matrix-js-sdk/src/@types/event";
 
 import { MatrixClientPeg } from './MatrixClientPeg';
 import Modal from './Modal';
@@ -31,6 +32,8 @@ import GroupStore from "./stores/GroupStore";
 import CountlyAnalytics from "./CountlyAnalytics";
 import { isJoinedOrNearlyJoined } from "./utils/membership";
 import { VIRTUAL_ROOM_EVENT_TYPE } from "./CallHandler";
+import SpaceStore from "./stores/SpaceStore";
+import { makeSpaceParentEvent } from "./utils/space";
 
 // we define a number of interfaces which take their names from the js-sdk
 /* eslint-disable camelcase */
@@ -84,6 +87,7 @@ export interface IOpts {
     inlineErrors?: boolean;
     andView?: boolean;
     associatedWithCommunity?: string;
+    parentSpace?: Room;
 }
 
 /**
@@ -175,6 +179,16 @@ export default function createRoom(opts: IOpts): Promise<string | null> {
         });
     }
 
+    if (opts.parentSpace) {
+        opts.createOpts.initial_state.push(makeSpaceParentEvent(opts.parentSpace, true));
+        opts.createOpts.initial_state.push({
+            type: EventType.RoomHistoryVisibility,
+            content: {
+                "history_visibility": opts.createOpts.preset === Preset.PublicChat ? "world_readable" : "invited",
+            },
+        });
+    }
+
     let modal;
     if (opts.spinner) modal = Modal.createDialog(Loader, null, 'mx_Dialog_spinner');
 
@@ -189,6 +203,9 @@ export default function createRoom(opts: IOpts): Promise<string | null> {
             return Promise.resolve();
         }
     }).then(() => {
+        if (opts.parentSpace) {
+            return SpaceStore.instance.addRoomToSpace(opts.parentSpace, roomId, [client.getDomain()], true);
+        }
         if (opts.associatedWithCommunity) {
             return GroupStore.addRoomToGroup(opts.associatedWithCommunity, roomId, false);
         }
diff --git a/src/utils/permalinks/Permalinks.js b/src/utils/permalinks/Permalinks.js
index 086abc669d..bcf4d87136 100644
--- a/src/utils/permalinks/Permalinks.js
+++ b/src/utils/permalinks/Permalinks.js
@@ -14,9 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {MatrixClientPeg} from "../../MatrixClientPeg";
 import isIp from "is-ip";
-import * as utils from 'matrix-js-sdk/src/utils';
+import * as utils from "matrix-js-sdk/src/utils";
+import {Room} from "matrix-js-sdk/src/models/room";
+
+import {MatrixClientPeg} from "../../MatrixClientPeg";
 import SpecPermalinkConstructor, {baseUrl as matrixtoBaseUrl} from "./SpecPermalinkConstructor";
 import PermalinkConstructor, {PermalinkParts} from "./PermalinkConstructor";
 import ElementPermalinkConstructor from "./ElementPermalinkConstructor";
@@ -121,6 +123,10 @@ export class RoomPermalinkCreator {
         this._started = false;
     }
 
+    get serverCandidates() {
+        return this._serverCandidates;
+    }
+
     isStarted() {
         return this._started;
     }
@@ -451,3 +457,9 @@ function isHostnameIpAddress(hostname) {
 
     return isIp(hostname);
 }
+
+export const calculateRoomVia = (room: Room) => {
+    const permalinkCreator = new RoomPermalinkCreator(room);
+    permalinkCreator.load();
+    return permalinkCreator.serverCandidates;
+};
diff --git a/src/utils/space.ts b/src/utils/space.ts
index 85faedf5d6..98801cabd0 100644
--- a/src/utils/space.ts
+++ b/src/utils/space.ts
@@ -18,6 +18,8 @@ import {Room} from "matrix-js-sdk/src/models/room";
 import {MatrixClient} from "matrix-js-sdk/src/client";
 import {EventType} from "matrix-js-sdk/src/@types/event";
 
+import {calculateRoomVia} from "../utils/permalinks/Permalinks";
+
 export const shouldShowSpaceSettings = (cli: MatrixClient, space: Room) => {
     const userId = cli.getUserId();
     return space.getMyMembership() === "join"
@@ -26,3 +28,12 @@ export const shouldShowSpaceSettings = (cli: MatrixClient, space: Room) => {
             || space.currentState.maySendStateEvent(EventType.RoomTopic, userId)
             || space.currentState.maySendStateEvent(EventType.RoomJoinRules, userId));
 };
+
+export const makeSpaceParentEvent = (room: Room, canonical = false) => ({
+    type: EventType.SpaceParent,
+    content: {
+        "via": calculateRoomVia(room),
+        "canonical": canonical,
+    },
+    state_key: room.roomId,
+});

From 9cec3828650490018e674bb4d79ebe97768ce3d4 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 27 Feb 2021 22:46:38 -0700
Subject: [PATCH 119/420] Change sending->sent state to match new designs

For https://github.com/vector-im/element-web/issues/16424
---
 res/css/views/rooms/_EventTile.scss           | 39 ++++++++++++-------
 res/img/element-icons/circle-sending.svg      |  3 ++
 res/img/element-icons/circle-sent.svg         |  4 ++
 res/themes/dark/css/_dark.scss                |  3 --
 res/themes/legacy-dark/css/_legacy-dark.scss  |  3 --
 .../legacy-light/css/_legacy-light.scss       |  2 -
 res/themes/light/css/_light.scss              |  2 -
 .../views/messages/EditHistoryMessage.js      |  1 +
 src/components/views/rooms/EventTile.js       | 21 +++++++++-
 9 files changed, 54 insertions(+), 24 deletions(-)
 create mode 100644 res/img/element-icons/circle-sending.svg
 create mode 100644 res/img/element-icons/circle-sent.svg

diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index 5841cf2853..028d9a7556 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -213,23 +213,36 @@ $left-gutter: 64px;
     color: $accent-fg-color;
 }
 
-.mx_EventTile_encrypting {
-    color: $event-encrypting-color !important;
-}
-
-.mx_EventTile_sending {
-    color: $event-sending-color;
-}
-
-.mx_EventTile_sending .mx_UserPill,
-.mx_EventTile_sending .mx_RoomPill {
-    opacity: 0.5;
-}
-
 .mx_EventTile_notSent {
     color: $event-notsent-color;
 }
 
+.mx_EventTile_receiptSent,
+.mx_EventTile_receiptSending {
+    // We don't use `position: relative` on the element because then it won't line
+    // up with the other read receipts
+
+    &::before {
+        background-color: $tertiary-fg-color;
+        mask-repeat: no-repeat;
+        mask-position: center;
+        mask-size: 14px;
+        width: 14px;
+        height: 14px;
+        content: '';
+        position: absolute;
+        top: 0;
+        left: 0;
+        right: 0;
+    }
+}
+.mx_EventTile_receiptSent::before {
+    mask-image: url('$(res)/img/element-icons/circle-sent.svg');
+}
+.mx_EventTile_receiptSending::before {
+    mask-image: url('$(res)/img/element-icons/circle-sending.svg');
+}
+
 .mx_EventTile_contextual {
     opacity: 0.4;
 }
diff --git a/res/img/element-icons/circle-sending.svg b/res/img/element-icons/circle-sending.svg
new file mode 100644
index 0000000000..2d15a0f716
--- /dev/null
+++ b/res/img/element-icons/circle-sending.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="8" cy="8" r="7.5" stroke="#8D99A5"/>
+</svg>
diff --git a/res/img/element-icons/circle-sent.svg b/res/img/element-icons/circle-sent.svg
new file mode 100644
index 0000000000..04a00ceff7
--- /dev/null
+++ b/res/img/element-icons/circle-sent.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8 15C11.866 15 15 11.866 15 8C15 4.13401 11.866 1 8 1C4.13401 1 1 4.13401 1 8C1 11.866 4.13401 15 8 15ZM8 16C12.4183 16 16 12.4183 16 8C16 3.58172 12.4183 0 8 0C3.58172 0 0 3.58172 0 8C0 12.4183 3.58172 16 8 16Z" fill="#8D99A5"/>
+<path d="M11.8697 4.95309C11.6784 4.7576 11.3597 4.74731 11.1578 4.93251L6.62066 9.04804L4.95244 7.91627C4.7293 7.77223 4.42116 7.77223 4.20865 7.95742C3.95363 8.1632 3.93238 8.5336 4.14489 8.78053L6.06813 10.9206C6.1 10.9515 6.13188 10.9926 6.17438 11.0132C6.53565 11.3013 7.07756 11.2498 7.37508 10.9L7.40695 10.8589L11.891 5.60128C12.0397 5.41608 12.0397 5.13828 11.8697 4.95309Z" fill="#8D99A5"/>
+</svg>
diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss
index a878aa3cdd..344f012d45 100644
--- a/res/themes/dark/css/_dark.scss
+++ b/res/themes/dark/css/_dark.scss
@@ -137,9 +137,6 @@ $panel-divider-color: transparent;
 $widget-menu-bar-bg-color: $header-panel-bg-color;
 $widget-body-bg-color: rgba(141, 151, 165, 0.2);
 
-// event tile lifecycle
-$event-sending-color: $text-secondary-color;
-
 // event redaction
 $event-redacted-fg-color: #606060;
 $event-redacted-border-color: #000000;
diff --git a/res/themes/legacy-dark/css/_legacy-dark.scss b/res/themes/legacy-dark/css/_legacy-dark.scss
index 3e3c299af9..ca3ead9ea8 100644
--- a/res/themes/legacy-dark/css/_legacy-dark.scss
+++ b/res/themes/legacy-dark/css/_legacy-dark.scss
@@ -132,9 +132,6 @@ $panel-divider-color: $header-panel-border-color;
 $widget-menu-bar-bg-color: $header-panel-bg-color;
 $widget-body-bg-color: #1A1D23;
 
-// event tile lifecycle
-$event-sending-color: $text-secondary-color;
-
 // event redaction
 $event-redacted-fg-color: #606060;
 $event-redacted-border-color: #000000;
diff --git a/res/themes/legacy-light/css/_legacy-light.scss b/res/themes/legacy-light/css/_legacy-light.scss
index a740ba155c..fa44c128d0 100644
--- a/res/themes/legacy-light/css/_legacy-light.scss
+++ b/res/themes/legacy-light/css/_legacy-light.scss
@@ -222,8 +222,6 @@ $widget-body-bg-color: #fff;
 $yellow-background: #fff8e3;
 
 // event tile lifecycle
-$event-encrypting-color: #abddbc;
-$event-sending-color: #ddd;
 $event-notsent-color: #f44;
 
 $event-highlight-fg-color: $warning-color;
diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss
index 1c89d83c01..ca52d0dcfa 100644
--- a/res/themes/light/css/_light.scss
+++ b/res/themes/light/css/_light.scss
@@ -222,8 +222,6 @@ $widget-body-bg-color: #FFF;
 $yellow-background: #fff8e3;
 
 // event tile lifecycle
-$event-encrypting-color: #abddbc;
-$event-sending-color: #ddd;
 $event-notsent-color: #f44;
 
 $event-highlight-fg-color: $warning-color;
diff --git a/src/components/views/messages/EditHistoryMessage.js b/src/components/views/messages/EditHistoryMessage.js
index df27773a40..6c420a16fc 100644
--- a/src/components/views/messages/EditHistoryMessage.js
+++ b/src/components/views/messages/EditHistoryMessage.js
@@ -158,6 +158,7 @@ export default class EditHistoryMessage extends React.PureComponent {
         const isSending = (['sending', 'queued', 'encrypting'].indexOf(this.state.sendStatus) !== -1);
         const classes = classNames({
             "mx_EventTile": true,
+            // Note: we keep these sending state classes for tests, not for our styles
             "mx_EventTile_sending": isSending,
             "mx_EventTile_notSent": this.state.sendStatus === 'not_sent',
         });
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 87fb190678..9110316850 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -454,8 +454,26 @@ export default class EventTile extends React.Component {
     };
 
     getReadAvatars() {
-        // return early if there are no read receipts
+        // return early if there are no read receipts, with our message state if applicable
         if (!this.props.readReceipts || this.props.readReceipts.length === 0) {
+            const room = this.context.getRoom(this.props.mxEvent.getRoomId());
+            const myUserId = MatrixClientPeg.get().getUserId();
+            if (this.props.mxEvent.getSender() === myUserId && room) {
+                // We only search for the most recent 50 events because surely someone will have
+                // sent *something* in that time, even if it is a membership event or something.
+                const readUsers = room.getUsersWhoHaveRead(this.props.mxEvent, 50);
+                const hasBeenRead = readUsers.length === 0 || readUsers.some(u => u !== myUserId);
+                console.log(room.getUsersReadUpTo(this.props.mxEvent));
+                let receipt = null;
+                if (!this.props.eventSendStatus || this.props.eventSendStatus === 'sent') {
+                    if (!hasBeenRead) {
+                        receipt = <span className='mx_EventTile_receiptSent' />;
+                    }
+                } else {
+                    receipt = <span className='mx_EventTile_receiptSending' />;
+                }
+                return <span className="mx_EventTile_readAvatars">{receipt}</span>;
+            }
             return (<span className="mx_EventTile_readAvatars" />);
         }
 
@@ -692,6 +710,7 @@ export default class EventTile extends React.Component {
             mx_EventTile_isEditing: isEditing,
             mx_EventTile_info: isInfoMessage,
             mx_EventTile_12hr: this.props.isTwelveHour,
+            // Note: we keep these sending state classes for tests, not for our styles
             mx_EventTile_encrypting: this.props.eventSendStatus === 'encrypting',
             mx_EventTile_sending: !isEditing && isSending,
             mx_EventTile_notSent: this.props.eventSendStatus === 'not_sent',

From db8978580c80f86a91dd2783a2415065dc49e57b Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 1 Mar 2021 16:21:04 -0700
Subject: [PATCH 120/420] Improve special read receipt checking

See comments in code
---
 src/components/views/rooms/EventTile.js | 133 ++++++++++++++++++++----
 1 file changed, 114 insertions(+), 19 deletions(-)

diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 9110316850..01e932dd3a 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -264,6 +264,79 @@ export default class EventTile extends React.Component {
 
         this._tile = createRef();
         this._replyThread = createRef();
+
+        // Throughout the component we manage a read receipt listener to see if our tile still
+        // qualifies for a "sent" or "sending" state (based on their relevant conditions). We
+        // don't want to over-subscribe to the read receipt events being fired, so we use a flag
+        // to determine if we've already subscribed and use a combination of other flags to find
+        // out if we should even be subscribed at all.
+        this._isListeningForReceipts = false;
+    }
+
+    /**
+     * When true, the tile qualifies for some sort of special read receipt. This could be a 'sending'
+     * or 'sent' receipt, for example.
+     * @returns {boolean}
+     * @private
+     */
+    get _isEligibleForSpecialReceipt() {
+        // First, if there are other read receipts then just short-circuit this.
+        if (this.props.readReceipts && this.props.readReceipts.length > 0) return false;
+        if (!this.props.mxEvent) return false;
+
+        // Sanity check (should never happen, but we shouldn't explode if it does)
+        const room = this.context.getRoom(this.props.mxEvent.getRoomId());
+        if (!room) return false;
+
+        // Quickly check to see if the event was sent by us. If it wasn't, it won't qualify for
+        // special read receipts.
+        const myUserId = MatrixClientPeg.get().getUserId();
+        if (this.props.mxEvent.getSender() !== myUserId) return false;
+
+        // Finally, determine if the type is relevant to the user. This notably excludes state
+        // events and pretty much anything that can't be sent by the composer as a message. For
+        // those we rely on local echo giving the impression of things changing, and expect them
+        // to be quick.
+        const simpleSendableEvents = [EventType.Sticker, EventType.RoomMessage, EventType.RoomMessageEncrypted];
+        if (!simpleSendableEvents.includes(this.props.mxEvent.getType())) return false;
+
+        // Default case
+        return true;
+    }
+
+    get _shouldShowSentReceipt() {
+        // If we're not even eligible, don't show the receipt.
+        if (!this._isEligibleForSpecialReceipt) return false;
+
+        // Check to make sure the sending state is appropriate. A null/undefined send status means
+        // that the message is 'sent', so we're just double checking that it's explicitly not sent.
+        if (this.props.eventSendStatus && this.props.eventSendStatus !== 'sent') return false;
+
+        // No point in doing the complex math if we're not going to even show this special receipt.
+        if (this._shouldShowSendingReceipt) return false;
+
+        // Next we check to see if any newer events have read receipts. If they do then we don't
+        // show our special state - the user already has feedback about their message. We only
+        // search for the most recent 50 events because surely someone will have sent *something*
+        // in that time, even if it is a membership event or something.
+        const room = this.context.getRoom(this.props.mxEvent.getRoomId());
+        const myUserId = MatrixClientPeg.get().getUserId();
+        const readUsers = room.getUsersWhoHaveRead(this.props.mxEvent, 50);
+        const hasBeenRead = readUsers.length === 0 || readUsers.some(u => u !== myUserId);
+        return !hasBeenRead;
+    }
+
+    get _shouldShowSendingReceipt() {
+        // If we're not even eligible, don't show the receipt.
+        if (!this._isEligibleForSpecialReceipt) return false;
+
+        // Check the event send status to see if we are pending. Null/undefined status means the
+        // message was sent, so check for that and 'sent' explicitly.
+        if (!this.props.eventSendStatus || this.props.eventSendStatus === 'sent') return false;
+
+        // Default to showing - there's no other event properties/behaviours we care about at
+        // this point.
+        return true;
     }
 
     // TODO: [REACT-WARNING] Move into constructor
@@ -281,6 +354,11 @@ export default class EventTile extends React.Component {
         if (this.props.showReactions) {
             this.props.mxEvent.on("Event.relationsCreated", this._onReactionsCreated);
         }
+
+        if (this._shouldShowSentReceipt || this._shouldShowSendingReceipt) {
+            client.on("Room.receipt", this._onRoomReceipt);
+            this._isListeningForReceipts = true;
+        }
     }
 
     // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
@@ -305,12 +383,40 @@ export default class EventTile extends React.Component {
         const client = this.context;
         client.removeListener("deviceVerificationChanged", this.onDeviceVerificationChanged);
         client.removeListener("userTrustStatusChanged", this.onUserVerificationChanged);
+        client.removeListener("Room.receipt", this._onRoomReceipt);
+        this._isListeningForReceipts = false;
         this.props.mxEvent.removeListener("Event.decrypted", this._onDecrypted);
         if (this.props.showReactions) {
             this.props.mxEvent.removeListener("Event.relationsCreated", this._onReactionsCreated);
         }
     }
 
+    componentDidUpdate(prevProps, prevState, snapshot) {
+        // If we're not listening for receipts and expect to be, register a listener.
+        if (!this._isListeningForReceipts && (this._shouldShowSentReceipt || this._shouldShowSendingReceipt)) {
+            this.context.on("Room.receipt", this._onRoomReceipt);
+            this._isListeningForReceipts = true;
+        }
+    }
+
+    _onRoomReceipt = (ev, room) => {
+        // ignore events for other rooms
+        const tileRoom = MatrixClientPeg.get().getRoom(this.props.mxEvent.getRoomId());
+        if (room !== tileRoom) return;
+
+        if (!this._shouldShowSentReceipt && !this._shouldShowSendingReceipt && !this._isListeningForReceipts) {
+            return;
+        }
+
+        this.forceUpdate(() => {
+            // Per elsewhere in this file, we can remove the listener once we will have no further purpose for it.
+            if (!this._shouldShowSentReceipt && !this._shouldShowSendingReceipt) {
+                this.context.removeListener("Room.receipt", this._onRoomReceipt);
+                this._isListeningForReceipts = false;
+            }
+        });
+    };
+
     /** called when the event is decrypted after we show it.
      */
     _onDecrypted = () => {
@@ -454,26 +560,15 @@ export default class EventTile extends React.Component {
     };
 
     getReadAvatars() {
-        // return early if there are no read receipts, with our message state if applicable
+        if (this._shouldShowSentReceipt) {
+            return <span className="mx_EventTile_readAvatars"><span className='mx_EventTile_receiptSent' /></span>;
+        }
+        if (this._shouldShowSendingReceipt) {
+            return <span className="mx_EventTile_readAvatars"><span className='mx_EventTile_receiptSending' /></span>;
+        }
+
+        // return early if there are no read receipts
         if (!this.props.readReceipts || this.props.readReceipts.length === 0) {
-            const room = this.context.getRoom(this.props.mxEvent.getRoomId());
-            const myUserId = MatrixClientPeg.get().getUserId();
-            if (this.props.mxEvent.getSender() === myUserId && room) {
-                // We only search for the most recent 50 events because surely someone will have
-                // sent *something* in that time, even if it is a membership event or something.
-                const readUsers = room.getUsersWhoHaveRead(this.props.mxEvent, 50);
-                const hasBeenRead = readUsers.length === 0 || readUsers.some(u => u !== myUserId);
-                console.log(room.getUsersReadUpTo(this.props.mxEvent));
-                let receipt = null;
-                if (!this.props.eventSendStatus || this.props.eventSendStatus === 'sent') {
-                    if (!hasBeenRead) {
-                        receipt = <span className='mx_EventTile_receiptSent' />;
-                    }
-                } else {
-                    receipt = <span className='mx_EventTile_receiptSending' />;
-                }
-                return <span className="mx_EventTile_readAvatars">{receipt}</span>;
-            }
             return (<span className="mx_EventTile_readAvatars" />);
         }
 

From 6fcb4c7cd2ddf0a5fc64ff1796d079389a3d8482 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Tue, 2 Mar 2021 07:37:00 +0100
Subject: [PATCH 121/420] Fix quote

Co-authored-by: Travis Ralston <travpc@gmail.com>
---
 .../views/settings/tabs/user/PreferencesUserSettingsTab.js      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
index 5e1c2e7288..ae9cad4cfa 100644
--- a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
@@ -48,7 +48,7 @@ export default class PreferencesUserSettingsTab extends React.Component {
         'showRedactions',
         'enableSyntaxHighlightLanguageDetection',
         'expandCodeByDefault',
-        `scrollToBottomOnMessageSent`,
+        'scrollToBottomOnMessageSent',
         'showCodeLineNumbers',
         'showJoinLeaves',
         'showAvatarChanges',

From ebedd3cbcbadaa8d945f430f5934ab7215e6b0c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Tue, 2 Mar 2021 07:41:14 +0100
Subject: [PATCH 122/420] Remove space

Co-authored-by: Travis Ralston <travpc@gmail.com>
---
 src/components/views/rooms/AuxPanel.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/rooms/AuxPanel.tsx b/src/components/views/rooms/AuxPanel.tsx
index b3ef8c3cc8..9d19c212c4 100644
--- a/src/components/views/rooms/AuxPanel.tsx
+++ b/src/components/views/rooms/AuxPanel.tsx
@@ -154,7 +154,7 @@ export default class AuxPanel extends React.Component<IProps, IState> {
             fileDropTarget = (
                 <div className="mx_RoomView_fileDropTarget">
                     <img
-                        src={require( "../../../../res/img/upload-big.svg")}
+                        src={require("../../../../res/img/upload-big.svg")}
                         className="mx_RoomView_fileDropTarget_image"
                     />
                     { _t("Drop file here to upload") }

From ff00683f321a0369bc41836fdc55007c38dfd75e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Tue, 2 Mar 2021 07:42:07 +0100
Subject: [PATCH 123/420] Use ===

Co-authored-by: Travis Ralston <travpc@gmail.com>
---
 src/components/structures/RoomView.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/structures/RoomView.tsx b/src/components/structures/RoomView.tsx
index 5b79f23e0b..4a58e21820 100644
--- a/src/components/structures/RoomView.tsx
+++ b/src/components/structures/RoomView.tsx
@@ -1159,7 +1159,7 @@ export default class RoomView extends React.Component<IProps, IState> {
             dragCounter: this.state.dragCounter - 1,
         });
 
-        if (this.state.dragCounter == 0) {
+        if (this.state.dragCounter === 0) {
             this.setState({
                 draggingFile: false,
             });

From 8efe7dcaa11b2de16a4f77cb6d0cbaae0fb6d3bc Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 2 Mar 2021 09:51:11 +0000
Subject: [PATCH 124/420] Decorate Right Panel cards with Space header for when
 viewing it in that context

---
 res/css/structures/_RightPanel.scss           | 17 ++++++
 res/css/views/rooms/_MemberInfo.scss          |  1 +
 res/css/views/rooms/_MemberList.scss          |  4 ++
 src/components/views/right_panel/UserInfo.tsx | 57 +++++++++++++------
 src/components/views/rooms/MemberList.js      | 22 ++++++-
 .../views/rooms/ThirdPartyMemberInfo.js       | 19 +++++--
 src/i18n/strings/en_EN.json                   |  3 +-
 7 files changed, 98 insertions(+), 25 deletions(-)

diff --git a/res/css/structures/_RightPanel.scss b/res/css/structures/_RightPanel.scss
index 5bf0d953f3..5515fe4060 100644
--- a/res/css/structures/_RightPanel.scss
+++ b/res/css/structures/_RightPanel.scss
@@ -160,3 +160,20 @@ limitations under the License.
         mask-position: center;
     }
 }
+
+.mx_RightPanel_scopeHeader {
+    margin: 24px;
+    text-align: center;
+    font-weight: $font-semi-bold;
+    font-size: $font-18px;
+    line-height: $font-22px;
+
+    .mx_BaseAvatar {
+        margin-right: 8px;
+        vertical-align: middle;
+    }
+
+    .mx_BaseAvatar_image {
+        border-radius: 8px;
+    }
+}
diff --git a/res/css/views/rooms/_MemberInfo.scss b/res/css/views/rooms/_MemberInfo.scss
index 182c280217..3f7f83d334 100644
--- a/res/css/views/rooms/_MemberInfo.scss
+++ b/res/css/views/rooms/_MemberInfo.scss
@@ -19,6 +19,7 @@ limitations under the License.
     flex-direction: column;
     flex: 1;
     overflow-y: auto;
+    margin-top: 8px;
 }
 
 .mx_MemberInfo_name {
diff --git a/res/css/views/rooms/_MemberList.scss b/res/css/views/rooms/_MemberList.scss
index 1e3506e371..631ddc484f 100644
--- a/res/css/views/rooms/_MemberList.scss
+++ b/res/css/views/rooms/_MemberList.scss
@@ -44,6 +44,10 @@ limitations under the License.
     .mx_AutoHideScrollbar {
         flex: 1 1 0;
     }
+
+    .mx_RightPanel_scopeHeader {
+        margin-top: -8px;
+    }
 }
 
 .mx_GroupMemberList_query,
diff --git a/src/components/views/right_panel/UserInfo.tsx b/src/components/views/right_panel/UserInfo.tsx
index a4b5cd0fbb..eb47a56269 100644
--- a/src/components/views/right_panel/UserInfo.tsx
+++ b/src/components/views/right_panel/UserInfo.tsx
@@ -60,7 +60,9 @@ import QuestionDialog from "../dialogs/QuestionDialog";
 import ConfirmUserActionDialog from "../dialogs/ConfirmUserActionDialog";
 import InfoDialog from "../dialogs/InfoDialog";
 import { EventType } from "matrix-js-sdk/src/@types/event";
-import {SetRightPanelPhasePayload} from "../../../dispatcher/payloads/SetRightPanelPhasePayload";
+import { SetRightPanelPhasePayload } from "../../../dispatcher/payloads/SetRightPanelPhasePayload";
+import RoomAvatar from "../avatars/RoomAvatar";
+import RoomName from "../elements/RoomName";
 
 interface IDevice {
     deviceId: string;
@@ -302,7 +304,8 @@ const UserOptionsSection: React.FC<{
     member: RoomMember;
     isIgnored: boolean;
     canInvite: boolean;
-}> = ({member, isIgnored, canInvite}) => {
+    isSpace?: boolean;
+}> = ({member, isIgnored, canInvite, isSpace}) => {
     const cli = useContext(MatrixClientContext);
 
     let ignoreButton = null;
@@ -342,7 +345,7 @@ const UserOptionsSection: React.FC<{
             </AccessibleButton>
         );
 
-        if (member.roomId) {
+        if (member.roomId && !isSpace) {
             const onReadReceiptButton = function() {
                 const room = cli.getRoom(member.roomId);
                 dis.dispatch({
@@ -434,14 +437,18 @@ const UserOptionsSection: React.FC<{
     );
 };
 
-const warnSelfDemote = async () => {
+const warnSelfDemote = async (isSpace) => {
     const {finished} = Modal.createTrackedDialog('Demoting Self', '', QuestionDialog, {
         title: _t("Demote yourself?"),
         description:
             <div>
-                { _t("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.") }
+                { isSpace
+                    ? _t("You will not be able to undo this change as you are demoting yourself, " +
+                        "if you are the last privileged user in the space it will be impossible " +
+                        "to regain privileges.")
+                    : _t("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.") }
             </div>,
         button: _t("Demote"),
     });
@@ -717,7 +724,7 @@ const MuteToggleButton: React.FC<IBaseRoomProps> = ({member, room, powerLevels,
         // if muting self, warn as it may be irreversible
         if (target === cli.getUserId()) {
             try {
-                if (!(await warnSelfDemote())) return;
+                if (!(await warnSelfDemote(room?.isSpaceRoom()))) return;
             } catch (e) {
                 console.error("Failed to warn about self demotion: ", e);
                 return;
@@ -806,7 +813,7 @@ const RoomAdminToolsContainer: React.FC<IBaseRoomProps> = ({
     if (canAffectUser && me.powerLevel >= kickPowerLevel) {
         kickButton = <RoomKickButton member={member} startUpdating={startUpdating} stopUpdating={stopUpdating} />;
     }
-    if (me.powerLevel >= redactPowerLevel) {
+    if (me.powerLevel >= redactPowerLevel && !room.isSpaceRoom()) {
         redactButton = (
             <RedactMessagesButton member={member} startUpdating={startUpdating} stopUpdating={stopUpdating} />
         );
@@ -1085,7 +1092,7 @@ const PowerLevelEditor: React.FC<{
         } else if (myUserId === target) {
             // If we are changing our own PL it can only ever be decreasing, which we cannot reverse.
             try {
-                if (!(await warnSelfDemote())) return;
+                if (!(await warnSelfDemote(room?.isSpaceRoom()))) return;
             } catch (e) {
                 console.error("Failed to warn about self demotion: ", e);
             }
@@ -1315,12 +1322,10 @@ const BasicUserInfo: React.FC<{
     if (!isRoomEncrypted) {
         if (!cryptoEnabled) {
             text = _t("This client does not support end-to-end encryption.");
-        } else if (room) {
+        } else if (room && !room.isSpaceRoom()) {
             text = _t("Messages in this room are not end-to-end encrypted.");
-        } else {
-            // TODO what to render for GroupMember
         }
-    } else {
+    } else if (!room.isSpaceRoom()) {
         text = _t("Messages in this room are end-to-end encrypted.");
     }
 
@@ -1381,7 +1386,9 @@ const BasicUserInfo: React.FC<{
         <UserOptionsSection
             canInvite={roomPermissions.canInvite}
             isIgnored={isIgnored}
-            member={member} />
+            member={member}
+            isSpace={room?.isSpaceRoom()}
+        />
 
         { adminToolsContainer }
 
@@ -1498,7 +1505,7 @@ interface IProps {
     user: Member;
     groupId?: string;
     room?: Room;
-    phase: RightPanelPhases.RoomMemberInfo | RightPanelPhases.GroupMemberInfo;
+    phase: RightPanelPhases.RoomMemberInfo | RightPanelPhases.GroupMemberInfo | RightPanelPhases.SpaceMemberInfo;
     onClose(): void;
 }
 
@@ -1542,7 +1549,9 @@ const UserInfo: React.FC<Props> = ({
         previousPhase = RightPanelPhases.RoomMemberInfo;
         refireParams = {member: member};
     } else if (room) {
-        previousPhase = RightPanelPhases.RoomMemberList;
+        previousPhase = previousPhase = room.isSpaceRoom()
+            ? RightPanelPhases.SpaceMemberList
+            : RightPanelPhases.RoomMemberList;
     }
 
     const onEncryptionPanelClose = () => {
@@ -1557,6 +1566,7 @@ const UserInfo: React.FC<Props> = ({
     switch (phase) {
         case RightPanelPhases.RoomMemberInfo:
         case RightPanelPhases.GroupMemberInfo:
+        case RightPanelPhases.SpaceMemberInfo:
             content = (
                 <BasicUserInfo
                     room={room}
@@ -1587,7 +1597,18 @@ const UserInfo: React.FC<Props> = ({
         }
     }
 
-    const header = <UserInfoHeader member={member} e2eStatus={e2eStatus} />;
+    let scopeHeader;
+    if (room?.isSpaceRoom()) {
+        scopeHeader = <div className="mx_RightPanel_scopeHeader">
+            <RoomAvatar room={room} height={32} width={32} />
+            <RoomName room={room} />
+        </div>;
+    }
+
+    const header = <React.Fragment>
+        { scopeHeader }
+        <UserInfoHeader member={member} e2eStatus={e2eStatus} />
+    </React.Fragment>;
     return <BaseCard
         className={classes.join(" ")}
         header={header}
diff --git a/src/components/views/rooms/MemberList.js b/src/components/views/rooms/MemberList.js
index 495a0f0d2c..d4d618c821 100644
--- a/src/components/views/rooms/MemberList.js
+++ b/src/components/views/rooms/MemberList.js
@@ -27,6 +27,8 @@ import * as sdk from "../../../index";
 import {CommunityPrototypeStore} from "../../../stores/CommunityPrototypeStore";
 import BaseCard from "../right_panel/BaseCard";
 import {RightPanelPhases} from "../../../stores/RightPanelStorePhases";
+import RoomAvatar from "../avatars/RoomAvatar";
+import RoomName from "../elements/RoomName";
 
 const INITIAL_LOAD_NUM_MEMBERS = 30;
 const INITIAL_LOAD_NUM_INVITED = 5;
@@ -456,6 +458,8 @@ export default class MemberList extends React.Component {
             const chat = CommunityPrototypeStore.instance.getSelectedCommunityGeneralChat();
             if (chat && chat.roomId === this.props.roomId) {
                 inviteButtonText = _t("Invite to this community");
+            } else if (room.isSpaceRoom()) {
+                inviteButtonText = _t("Invite to this space");
             }
 
             const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
@@ -483,12 +487,26 @@ export default class MemberList extends React.Component {
                 onSearch={ this.onSearchQueryChanged } />
         );
 
+        let previousPhase = RightPanelPhases.RoomSummary;
+        // We have no previousPhase for when viewing a MemberList from a Space
+        let scopeHeader;
+        if (room?.isSpaceRoom()) {
+            previousPhase = undefined;
+            scopeHeader = <div className="mx_RightPanel_scopeHeader">
+                <RoomAvatar room={room} height={32} width={32} />
+                <RoomName room={room} />
+            </div>;
+        }
+
         return <BaseCard
             className="mx_MemberList"
-            header={inviteButton}
+            header={<React.Fragment>
+                { scopeHeader }
+                { inviteButton }
+            </React.Fragment>}
             footer={footer}
             onClose={this.props.onClose}
-            previousPhase={RightPanelPhases.RoomSummary}
+            previousPhase={previousPhase}
         >
             <div className="mx_MemberList_wrapper">
                 <TruncatedList className="mx_MemberList_section mx_MemberList_joined" truncateAt={this.state.truncateAtJoined}
diff --git a/src/components/views/rooms/ThirdPartyMemberInfo.js b/src/components/views/rooms/ThirdPartyMemberInfo.js
index 3a7042ebd2..73510c2b4f 100644
--- a/src/components/views/rooms/ThirdPartyMemberInfo.js
+++ b/src/components/views/rooms/ThirdPartyMemberInfo.js
@@ -23,6 +23,8 @@ import dis from "../../../dispatcher/dispatcher";
 import * as sdk from "../../../index";
 import Modal from "../../../Modal";
 import {isValid3pidInvite} from "../../../RoomInvite";
+import RoomAvatar from "../avatars/RoomAvatar";
+import RoomName from "../elements/RoomName";
 
 export default class ThirdPartyMemberInfo extends React.Component {
     static propTypes = {
@@ -32,14 +34,14 @@ export default class ThirdPartyMemberInfo extends React.Component {
     constructor(props) {
         super(props);
 
-        const room = MatrixClientPeg.get().getRoom(this.props.event.getRoomId());
-        const me = room.getMember(MatrixClientPeg.get().getUserId());
-        const powerLevels = room.currentState.getStateEvents("m.room.power_levels", "");
+        this.room = MatrixClientPeg.get().getRoom(this.props.event.getRoomId());
+        const me = this.room.getMember(MatrixClientPeg.get().getUserId());
+        const powerLevels = this.room.currentState.getStateEvents("m.room.power_levels", "");
 
         let kickLevel = powerLevels ? powerLevels.getContent().kick : 50;
         if (typeof(kickLevel) !== 'number') kickLevel = 50;
 
-        const sender = room.getMember(this.props.event.getSender());
+        const sender = this.room.getMember(this.props.event.getSender());
 
         this.state = {
             stateKey: this.props.event.getStateKey(),
@@ -119,9 +121,18 @@ export default class ThirdPartyMemberInfo extends React.Component {
             );
         }
 
+        let scopeHeader;
+        if (this.room.isSpaceRoom()) {
+            scopeHeader = <div className="mx_RightPanel_scopeHeader">
+                <RoomAvatar room={this.room} height={32} width={32} />
+                <RoomName room={this.room} />
+            </div>;
+        }
+
         // We shamelessly rip off the MemberInfo styles here.
         return (
             <div className="mx_MemberInfo" role="tabpanel">
+                { scopeHeader }
                 <div className="mx_MemberInfo_name">
                     <AccessibleButton className="mx_MemberInfo_cancel"
                         onClick={this.onCancel}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index ae12b195a0..472fd9b1e7 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1436,6 +1436,7 @@
     "and %(count)s others...|one": "and one other...",
     "Invite to this room": "Invite to this room",
     "Invite to this community": "Invite to this community",
+    "Invite to this space": "Invite to this space",
     "Invited": "Invited",
     "Filter room members": "Filter room members",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (power %(powerLevelNumber)s)",
@@ -1698,6 +1699,7 @@
     "Share Link to User": "Share Link to User",
     "Direct message": "Direct message",
     "Demote yourself?": "Demote yourself?",
+    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the space it will be impossible to regain privileges.": "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the space it will be impossible to regain privileges.",
     "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.",
     "Demote": "Demote",
     "Disinvite": "Disinvite",
@@ -2167,7 +2169,6 @@
     "Start a conversation with someone using their name or username (like <userId/>).": "Start a conversation with someone using their name or username (like <userId/>).",
     "This won't invite them to %(communityName)s. To invite someone to %(communityName)s, click <a>here</a>": "This won't invite them to %(communityName)s. To invite someone to %(communityName)s, click <a>here</a>",
     "Go": "Go",
-    "Invite to this space": "Invite to this space",
     "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.": "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.",
     "Invite someone using their name, username (like <userId/>) or <a>share this room</a>.": "Invite someone using their name, username (like <userId/>) or <a>share this room</a>.",
     "Invite someone using their name, email address, username (like <userId/>) or <a>share this space</a>.": "Invite someone using their name, email address, username (like <userId/>) or <a>share this space</a>.",

From dfd0aaffe348e85c32b13b702e6a7cf0feb048c5 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 2 Mar 2021 09:55:55 +0000
Subject: [PATCH 125/420] Iterate copy for some global warning prompts for
 spaces

---
 src/components/structures/MatrixChat.tsx | 14 ++++++++++----
 src/i18n/strings/en_EN.json              |  3 +++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index 8e3d3e6b5f..d9d8b659c9 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -1072,6 +1072,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
 
     private leaveRoomWarnings(roomId: string) {
         const roomToLeave = MatrixClientPeg.get().getRoom(roomId);
+        const isSpace = roomToLeave?.isSpaceRoom();
         // Show a warning if there are additional complications.
         const joinRules = roomToLeave.currentState.getStateEvents('m.room.join_rules', '');
         const warnings = [];
@@ -1081,7 +1082,9 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 warnings.push((
                     <span className="warning" key="non_public_warning">
                         {' '/* Whitespace, otherwise the sentences get smashed together */ }
-                        { _t("This room is not public. You will not be able to rejoin without an invite.") }
+                        { isSpace
+                            ? _t("This space is not public. You will not be able to rejoin without an invite.")
+                            : _t("This room is not public. You will not be able to rejoin without an invite.") }
                     </span>
                 ));
             }
@@ -1094,11 +1097,14 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         const roomToLeave = MatrixClientPeg.get().getRoom(roomId);
         const warnings = this.leaveRoomWarnings(roomId);
 
-        Modal.createTrackedDialog('Leave room', '', QuestionDialog, {
-            title: _t("Leave room"),
+        const isSpace = roomToLeave?.isSpaceRoom();
+        Modal.createTrackedDialog(isSpace ? "Leave space" : "Leave room", '', QuestionDialog, {
+            title: isSpace ? _t("Leave space") : _t("Leave room"),
             description: (
                 <span>
-                    { _t("Are you sure you want to leave the room '%(roomName)s'?", {roomName: roomToLeave.name}) }
+                    { isSpace
+                        ? _t("Are you sure you want to leave the space '%(spaceName)s'?", {spaceName: roomToLeave.name})
+                        : _t("Are you sure you want to leave the room '%(roomName)s'?", {roomName: roomToLeave.name}) }
                     { warnings }
                 </span>
             ),
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 472fd9b1e7..6603a83496 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2493,7 +2493,10 @@
     "Failed to reject invitation": "Failed to reject invitation",
     "Cannot create rooms in this community": "Cannot create rooms in this community",
     "You do not have permission to create rooms in this community.": "You do not have permission to create rooms in this community.",
+    "This space is not public. You will not be able to rejoin without an invite.": "This space is not public. You will not be able to rejoin without an invite.",
     "This room is not public. You will not be able to rejoin without an invite.": "This room is not public. You will not be able to rejoin without an invite.",
+    "Leave space": "Leave space",
+    "Are you sure you want to leave the space '%(spaceName)s'?": "Are you sure you want to leave the space '%(spaceName)s'?",
     "Are you sure you want to leave the room '%(roomName)s'?": "Are you sure you want to leave the room '%(roomName)s'?",
     "Failed to forget room %(errCode)s": "Failed to forget room %(errCode)s",
     "Signed Out": "Signed Out",

From 926e226a784d5bd66dee9f788618c060cb693e46 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 2 Mar 2021 10:07:43 +0000
Subject: [PATCH 126/420] Add Invite CTA to Space View

---
 res/css/structures/_SpaceRoomView.scss        | 54 +++++++++++++++++++
 src/RoomInvite.js                             | 14 ++---
 src/components/structures/SpaceRoomView.tsx   | 18 ++++++-
 .../views/spaces/SpacePublicShare.tsx         |  4 +-
 src/i18n/strings/en_EN.json                   |  1 +
 5 files changed, 78 insertions(+), 13 deletions(-)

diff --git a/res/css/structures/_SpaceRoomView.scss b/res/css/structures/_SpaceRoomView.scss
index 559f405e59..946856eed3 100644
--- a/res/css/structures/_SpaceRoomView.scss
+++ b/res/css/structures/_SpaceRoomView.scss
@@ -135,6 +135,60 @@ $SpaceRoomViewInnerWidth: 428px;
                 padding: 8px 22px;
             }
         }
+
+        .mx_SpaceRoomView_landing_adminButtons {
+            margin-top: 32px;
+
+            .mx_AccessibleButton {
+                position: relative;
+                width: 160px;
+                height: 124px;
+                box-sizing: border-box;
+                padding: 72px 16px 0;
+                border-radius: 12px;
+                border: 1px solid $space-button-outline-color;
+                margin-right: 28px;
+                margin-bottom: 28px;
+                font-size: $font-14px;
+                display: inline-block;
+                vertical-align: bottom;
+
+                &:last-child {
+                    margin-right: 0;
+                }
+
+                &:hover {
+                    background-color: rgba(141, 151, 165, 0.1);
+                }
+
+                &::before, &::after {
+                    position: absolute;
+                    content: "";
+                    left: 16px;
+                    top: 16px;
+                    height: 40px;
+                    width: 40px;
+                    border-radius: 20px;
+                }
+
+                &::after {
+                    mask-position: center;
+                    mask-size: 30px;
+                    mask-repeat: no-repeat;
+                    background: #ffffff; // white icon fill
+                }
+
+                &.mx_SpaceRoomView_landing_inviteButton {
+                    &::before {
+                        background-color: $accent-color;
+                    }
+
+                    &::after {
+                        mask-image: url('$(res)/img/element-icons/room/invite.svg');
+                    }
+                }
+            }
+        }
     }
 
     .mx_SpaceRoomView_privateScope {
diff --git a/src/RoomInvite.js b/src/RoomInvite.js
index 728ae11e79..503411d2b3 100644
--- a/src/RoomInvite.js
+++ b/src/RoomInvite.js
@@ -50,10 +50,13 @@ export function showStartChatInviteDialog(initialText) {
 }
 
 export function showRoomInviteDialog(roomId) {
+    const isSpace = MatrixClientPeg.get()?.getRoom(roomId)?.isSpaceRoom();
     // This dialog handles the room creation internally - we don't need to worry about it.
-    const InviteDialog = sdk.getComponent("dialogs.InviteDialog");
     Modal.createTrackedDialog(
-        'Invite Users', '', InviteDialog, {kind: KIND_INVITE, roomId},
+        "Invite Users", isSpace ? "Space" : "Room", InviteDialog, {
+            kind: isSpace ? KIND_SPACE_INVITE : KIND_INVITE,
+            roomId,
+        },
         /*className=*/null, /*isPriority=*/false, /*isStatic=*/true,
     );
 }
@@ -75,13 +78,6 @@ export function showCommunityInviteDialog(communityId) {
     }
 }
 
-export const showSpaceInviteDialog = (roomId) => {
-    Modal.createTrackedDialog("Invite Users", "Space", InviteDialog, {
-        kind: KIND_SPACE_INVITE,
-        roomId,
-    }, /*className=*/null, /*isPriority=*/false, /*isStatic=*/true);
-};
-
 /**
  * Checks if the given MatrixEvent is a valid 3rd party user invite.
  * @param {MatrixEvent} event The event to check
diff --git a/src/components/structures/SpaceRoomView.tsx b/src/components/structures/SpaceRoomView.tsx
index 6c64df31eb..9e73b97d5a 100644
--- a/src/components/structures/SpaceRoomView.tsx
+++ b/src/components/structures/SpaceRoomView.tsx
@@ -25,7 +25,7 @@ import AccessibleButton from "../views/elements/AccessibleButton";
 import RoomName from "../views/elements/RoomName";
 import RoomTopic from "../views/elements/RoomTopic";
 import FormButton from "../views/elements/FormButton";
-import {inviteMultipleToRoom, showSpaceInviteDialog} from "../../RoomInvite";
+import {inviteMultipleToRoom, showRoomInviteDialog} from "../../RoomInvite";
 import {useRoomMembers} from "../../hooks/useRoomMembers";
 import createRoom, {IOpts, Preset} from "../../createRoom";
 import Field from "../views/elements/Field";
@@ -108,6 +108,17 @@ const SpaceLanding = ({ space, onJoinButtonClicked, onRejectButtonClicked }) =>
         </div>;
     }
 
+    let inviteButton;
+    if (myMembership === "join" && space.canInvite(userId)) {
+        inviteButton = (
+            <AccessibleButton className="mx_SpaceRoomView_landing_inviteButton" onClick={() => {
+                showRoomInviteDialog(space.roomId);
+            }}>
+                { _t("Invite people") }
+            </AccessibleButton>
+        );
+    }
+
     return <div className="mx_SpaceRoomView_landing">
         <RoomAvatar room={space} height={80} width={80} viewAvatarOnClick={true} />
         <div className="mx_SpaceRoomView_landing_name">
@@ -167,6 +178,9 @@ const SpaceLanding = ({ space, onJoinButtonClicked, onRejectButtonClicked }) =>
             <RoomTopic room={space} />
         </div>
         { joinButtons }
+        <div className="mx_SpaceRoomView_landing_adminButtons">
+            { inviteButton }
+        </div>
     </div>;
 };
 
@@ -361,7 +375,7 @@ const SpaceSetupPrivateInvite = ({ space, onFinished }) => {
         <div className="mx_SpaceRoomView_inviteTeammates_buttons">
             <AccessibleButton
                 className="mx_SpaceRoomView_inviteTeammates_inviteDialogButton"
-                onClick={() => showSpaceInviteDialog(space.roomId)}
+                onClick={() => showRoomInviteDialog(space.roomId)}
             >
                 { _t("Invite by username") }
             </AccessibleButton>
diff --git a/src/components/views/spaces/SpacePublicShare.tsx b/src/components/views/spaces/SpacePublicShare.tsx
index 064d1640a2..3930c1db16 100644
--- a/src/components/views/spaces/SpacePublicShare.tsx
+++ b/src/components/views/spaces/SpacePublicShare.tsx
@@ -22,7 +22,7 @@ import AccessibleButton from "../elements/AccessibleButton";
 import {copyPlaintext} from "../../../utils/strings";
 import {sleep} from "../../../utils/promise";
 import {RoomPermalinkCreator} from "../../../utils/permalinks/Permalinks";
-import {showSpaceInviteDialog} from "../../../RoomInvite";
+import {showRoomInviteDialog} from "../../../RoomInvite";
 
 interface IProps {
     space: Room;
@@ -53,7 +53,7 @@ const SpacePublicShare = ({ space, onFinished }: IProps) => {
         <AccessibleButton
             className="mx_SpacePublicShare_inviteButton"
             onClick={() => {
-                showSpaceInviteDialog(space.roomId);
+                showRoomInviteDialog(space.roomId);
                 onFinished();
             }}
         >
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 6603a83496..5f3d293571 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2561,6 +2561,7 @@
     "You have %(count)s unread notifications in a prior version of this room.|other": "You have %(count)s unread notifications in a prior version of this room.",
     "You have %(count)s unread notifications in a prior version of this room.|one": "You have %(count)s unread notification in a prior version of this room.",
     "Accept Invite": "Accept Invite",
+    "Invite people": "Invite people",
     "%(count)s members|other": "%(count)s members",
     "%(count)s members|one": "%(count)s member",
     "<inviter/> invited you to <name/>": "<inviter/> invited you to <name/>",

From 0a4c0b69b0fa250fa01c3ff1a88ba272dc5ef64e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Tue, 2 Mar 2021 12:07:33 +0100
Subject: [PATCH 127/420] Move fileDropTarget to RoomView
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 src/components/structures/RoomView.tsx  | 17 +++++++++++++++--
 src/components/views/rooms/AuxPanel.tsx | 17 -----------------
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/src/components/structures/RoomView.tsx b/src/components/structures/RoomView.tsx
index 4a58e21820..af7b8ee704 100644
--- a/src/components/structures/RoomView.tsx
+++ b/src/components/structures/RoomView.tsx
@@ -1782,6 +1782,19 @@ export default class RoomView extends React.Component<IProps, IState> {
             }
         }
 
+        let fileDropTarget = null;
+        if (this.state.draggingFile) {
+            fileDropTarget = (
+                <div className="mx_RoomView_fileDropTarget">
+                    <img
+                        src={require("../../../res/img/upload-big.svg")}
+                        className="mx_RoomView_fileDropTarget_image"
+                    />
+                    { _t("Drop file here to upload") }
+                </div>
+            );
+        }
+
         // We have successfully loaded this room, and are not previewing.
         // Display the "normal" room view.
 
@@ -1893,7 +1906,6 @@ export default class RoomView extends React.Component<IProps, IState> {
                 room={this.state.room}
                 fullHeight={false}
                 userId={this.context.credentials.userId}
-                draggingFile={this.state.draggingFile}
                 maxHeight={this.state.auxPanelMaxHeight}
                 showApps={this.state.showApps}
                 onResize={this.onResize}
@@ -2059,8 +2071,9 @@ export default class RoomView extends React.Component<IProps, IState> {
                         />
                         <MainSplit panel={rightPanel} resizeNotifier={this.props.resizeNotifier}>
                             <div className="mx_RoomView_body">
+                                {auxPanel}
                                 <div className={timelineClasses}>
-                                    {auxPanel}
+                                    {fileDropTarget}
                                     {topUnreadMessagesBar}
                                     {jumpToBottom}
                                     {messagePanel}
diff --git a/src/components/views/rooms/AuxPanel.tsx b/src/components/views/rooms/AuxPanel.tsx
index 9d19c212c4..7aa7be42b6 100644
--- a/src/components/views/rooms/AuxPanel.tsx
+++ b/src/components/views/rooms/AuxPanel.tsx
@@ -35,9 +35,6 @@ interface IProps {
     userId: string,
     showApps: boolean, // Render apps
 
-    // set to true to show the file drop target
-    draggingFile: boolean,
-
     // maxHeight attribute for the aux panel and the video
     // therein
     maxHeight: number,
@@ -149,19 +146,6 @@ export default class AuxPanel extends React.Component<IProps, IState> {
     }
 
     render() {
-        let fileDropTarget = null;
-        if (this.props.draggingFile) {
-            fileDropTarget = (
-                <div className="mx_RoomView_fileDropTarget">
-                    <img
-                        src={require("../../../../res/img/upload-big.svg")}
-                        className="mx_RoomView_fileDropTarget_image"
-                    />
-                    { _t("Drop file here to upload") }
-                </div>
-            );
-        }
-
         const callView = (
             <CallViewForRoom
                 roomId={this.props.room.roomId}
@@ -244,7 +228,6 @@ export default class AuxPanel extends React.Component<IProps, IState> {
             <AutoHideScrollbar className={classes} style={style} >
                 { stateViews }
                 { appsDrawer }
-                { fileDropTarget }
                 { callView }
                 { this.props.children }
             </AutoHideScrollbar>

From 4476843264eeb61380662eb0040a30edfec42c99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Tue, 2 Mar 2021 12:12:10 +0100
Subject: [PATCH 128/420] Remove unused _t
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 src/components/views/rooms/AuxPanel.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/views/rooms/AuxPanel.tsx b/src/components/views/rooms/AuxPanel.tsx
index 7aa7be42b6..c9821d51e3 100644
--- a/src/components/views/rooms/AuxPanel.tsx
+++ b/src/components/views/rooms/AuxPanel.tsx
@@ -20,7 +20,6 @@ import { Room } from 'matrix-js-sdk/src/models/room'
 import dis from "../../../dispatcher/dispatcher";
 import * as ObjectUtils from '../../../ObjectUtils';
 import AppsDrawer from './AppsDrawer';
-import { _t } from '../../../languageHandler';
 import classNames from 'classnames';
 import RateLimitedFunc from '../../../ratelimitedfunc';
 import SettingsStore from "../../../settings/SettingsStore";

From 831cc7eaa0ecd57a25cff40daf582b02e3fd4e21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Tue, 2 Mar 2021 12:14:36 +0100
Subject: [PATCH 129/420] i18n
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@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 9af8ccc172..5d2c70be03 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1381,7 +1381,6 @@
     "Remove %(phone)s?": "Remove %(phone)s?",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.",
     "Phone Number": "Phone Number",
-    "Drop file here to upload": "Drop file here to upload",
     "This user has not verified all of their sessions.": "This user has not verified all of their sessions.",
     "You have not verified this user.": "You have not verified this user.",
     "You have verified this user. This user has verified all of their sessions.": "You have verified this user. This user has verified all of their sessions.",
@@ -2513,6 +2512,7 @@
     "No more results": "No more results",
     "Room": "Room",
     "Failed to reject invite": "Failed to reject invite",
+    "Drop file here to upload": "Drop file here to upload",
     "You have %(count)s unread notifications in a prior version of this room.|other": "You have %(count)s unread notifications in a prior version of this room.",
     "You have %(count)s unread notifications in a prior version of this room.|one": "You have %(count)s unread notification in a prior version of this room.",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.",

From ab4b7b73ea7f8eeb18be6ab7491e2e1649b35969 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 2 Mar 2021 10:34:28 +0000
Subject: [PATCH 130/420] Add a basic Space Settings view

---
 res/css/_components.scss                      |   1 +
 res/css/structures/_SpaceRoomView.scss        |  10 ++
 .../views/dialogs/_SpaceSettingsDialog.scss   |  55 ++++++
 src/components/structures/MatrixChat.tsx      |   4 +
 src/components/structures/SpaceRoomView.tsx   |  12 +-
 .../views/dialogs/SpaceSettingsDialog.tsx     | 162 ++++++++++++++++++
 src/i18n/strings/en_EN.json                   |   8 +
 src/utils/space.ts                            |   9 +
 8 files changed, 260 insertions(+), 1 deletion(-)
 create mode 100644 res/css/views/dialogs/_SpaceSettingsDialog.scss
 create mode 100644 src/components/views/dialogs/SpaceSettingsDialog.tsx

diff --git a/res/css/_components.scss b/res/css/_components.scss
index ca66aa60ec..db73eed3f2 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -91,6 +91,7 @@
 @import "./views/dialogs/_SettingsDialog.scss";
 @import "./views/dialogs/_ShareDialog.scss";
 @import "./views/dialogs/_SlashCommandHelpDialog.scss";
+@import "./views/dialogs/_SpaceSettingsDialog.scss";
 @import "./views/dialogs/_TabbedIntegrationManagerDialog.scss";
 @import "./views/dialogs/_TermsDialog.scss";
 @import "./views/dialogs/_UploadConfirmDialog.scss";
diff --git a/res/css/structures/_SpaceRoomView.scss b/res/css/structures/_SpaceRoomView.scss
index 946856eed3..0a42db130a 100644
--- a/res/css/structures/_SpaceRoomView.scss
+++ b/res/css/structures/_SpaceRoomView.scss
@@ -187,6 +187,16 @@ $SpaceRoomViewInnerWidth: 428px;
                         mask-image: url('$(res)/img/element-icons/room/invite.svg');
                     }
                 }
+
+                &.mx_SpaceRoomView_landing_settingsButton {
+                    &::before {
+                        background-color: #5c56f5;
+                    }
+
+                    &::after {
+                        mask-image: url('$(res)/img/element-icons/settings.svg');
+                    }
+                }
             }
         }
     }
diff --git a/res/css/views/dialogs/_SpaceSettingsDialog.scss b/res/css/views/dialogs/_SpaceSettingsDialog.scss
new file mode 100644
index 0000000000..c1fa539e9b
--- /dev/null
+++ b/res/css/views/dialogs/_SpaceSettingsDialog.scss
@@ -0,0 +1,55 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.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_SpaceSettingsDialog {
+    width: 480px;
+    color: $primary-fg-color;
+
+    .mx_SpaceSettings_errorText {
+        font-weight: $font-semi-bold;
+        font-size: $font-12px;
+        line-height: $font-15px;
+        color: $notice-primary-color;
+        margin-bottom: 28px;
+    }
+
+    .mx_ToggleSwitch {
+        display: inline-block;
+        vertical-align: middle;
+        margin-left: 16px;
+    }
+
+    .mx_AccessibleButton_kind_danger {
+        margin-top: 28px;
+    }
+
+    .mx_SpaceSettingsDialog_buttons {
+        display: flex;
+        margin-top: 64px;
+
+        .mx_AccessibleButton {
+            display: inline-block;
+        }
+
+        .mx_AccessibleButton_kind_link {
+            margin-left: auto;
+        }
+    }
+
+    .mx_FormButton {
+        padding: 8px 22px;
+    }
+}
diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index d9d8b659c9..83b3565738 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -1118,6 +1118,10 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                     const modal = Modal.createDialog(Loader, null, 'mx_Dialog_spinner');
 
                     d.finally(() => modal.close());
+                    dis.dispatch({
+                        action: "after_leave_room",
+                        room_id: roomId,
+                    });
                 }
             },
         });
diff --git a/src/components/structures/SpaceRoomView.tsx b/src/components/structures/SpaceRoomView.tsx
index 9e73b97d5a..49af14017e 100644
--- a/src/components/structures/SpaceRoomView.tsx
+++ b/src/components/structures/SpaceRoomView.tsx
@@ -46,7 +46,7 @@ import {RightPanelPhases} from "../../stores/RightPanelStorePhases";
 import {SetRightPanelPhasePayload} from "../../dispatcher/payloads/SetRightPanelPhasePayload";
 import {useStateArray} from "../../hooks/useStateArray";
 import SpacePublicShare from "../views/spaces/SpacePublicShare";
-import {shouldShowSpaceSettings} from "../../utils/space";
+import {shouldShowSpaceSettings, showSpaceSettings} from "../../utils/space";
 import MemberAvatar from "../views/avatars/MemberAvatar";
 
 interface IProps {
@@ -119,6 +119,15 @@ const SpaceLanding = ({ space, onJoinButtonClicked, onRejectButtonClicked }) =>
         );
     }
 
+    let settingsButton;
+    if (shouldShowSpaceSettings(cli, space)) {
+        settingsButton = <AccessibleButton className="mx_SpaceRoomView_landing_settingsButton" onClick={() => {
+            showSpaceSettings(cli, space);
+        }}>
+            { _t("Settings") }
+        </AccessibleButton>;
+    }
+
     return <div className="mx_SpaceRoomView_landing">
         <RoomAvatar room={space} height={80} width={80} viewAvatarOnClick={true} />
         <div className="mx_SpaceRoomView_landing_name">
@@ -180,6 +189,7 @@ const SpaceLanding = ({ space, onJoinButtonClicked, onRejectButtonClicked }) =>
         { joinButtons }
         <div className="mx_SpaceRoomView_landing_adminButtons">
             { inviteButton }
+            { settingsButton }
         </div>
     </div>;
 };
diff --git a/src/components/views/dialogs/SpaceSettingsDialog.tsx b/src/components/views/dialogs/SpaceSettingsDialog.tsx
new file mode 100644
index 0000000000..f6bf5b87e6
--- /dev/null
+++ b/src/components/views/dialogs/SpaceSettingsDialog.tsx
@@ -0,0 +1,162 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, {useState} from 'react';
+import {Room} from "matrix-js-sdk/src/models/room";
+import {MatrixClient} from "matrix-js-sdk/src/client";
+import {EventType} from "matrix-js-sdk/src/@types/event";
+
+import {_t} from '../../../languageHandler';
+import {IDialogProps} from "./IDialogProps";
+import BaseDialog from "./BaseDialog";
+import DevtoolsDialog from "./DevtoolsDialog";
+import SpaceBasicSettings from '../spaces/SpaceBasicSettings';
+import {getTopic} from "../elements/RoomTopic";
+import {avatarUrlForRoom} from "../../../Avatar";
+import ToggleSwitch from "../elements/ToggleSwitch";
+import AccessibleButton from "../elements/AccessibleButton";
+import FormButton from "../elements/FormButton";
+import Modal from "../../../Modal";
+import defaultDispatcher from "../../../dispatcher/dispatcher";
+import {allSettled} from "../../../utils/promise";
+import {useDispatcher} from "../../../hooks/useDispatcher";
+
+interface IProps extends IDialogProps {
+    matrixClient: MatrixClient;
+    space: Room;
+}
+
+const SpaceSettingsDialog: React.FC<IProps> = ({ matrixClient: cli, space, onFinished }) => {
+    useDispatcher(defaultDispatcher, ({action, ...params}) => {
+        if (action === "after_leave_room" && params.room_id === space.roomId) {
+            onFinished(false);
+        }
+    });
+
+    const [busy, setBusy] = useState(false);
+    const [error, setError] = useState("");
+
+    const userId = cli.getUserId();
+
+    const [newAvatar, setNewAvatar] = useState<File>(null); // undefined means to remove avatar
+    const canSetAvatar = space.currentState.maySendStateEvent(EventType.RoomAvatar, userId);
+    const avatarChanged = newAvatar !== null;
+
+    const [name, setName] = useState<string>(space.name);
+    const canSetName = space.currentState.maySendStateEvent(EventType.RoomName, userId);
+    const nameChanged = name !== space.name;
+
+    const currentTopic = getTopic(space);
+    const [topic, setTopic] = useState<string>(currentTopic);
+    const canSetTopic = space.currentState.maySendStateEvent(EventType.RoomTopic, userId);
+    const topicChanged = topic !== currentTopic;
+
+    const currentJoinRule = space.getJoinRule();
+    const [joinRule, setJoinRule] = useState(currentJoinRule);
+    const canSetJoinRule = space.currentState.maySendStateEvent(EventType.RoomJoinRules, userId);
+    const joinRuleChanged = joinRule !== currentJoinRule;
+
+    const onSave = async () => {
+        setBusy(true);
+        const promises = [];
+
+        if (avatarChanged) {
+            promises.push(cli.sendStateEvent(space.roomId, EventType.RoomAvatar, {
+                url: await cli.uploadContent(newAvatar),
+            }, ""));
+        }
+
+        if (nameChanged) {
+            promises.push(cli.setRoomName(space.roomId, name));
+        }
+
+        if (topicChanged) {
+            promises.push(cli.setRoomTopic(space.roomId, topic));
+        }
+
+        if (joinRuleChanged) {
+            promises.push(cli.sendStateEvent(space.roomId, EventType.RoomJoinRules, { join_rule: joinRule }, ""));
+        }
+
+        const results = await allSettled(promises);
+        setBusy(false);
+        const failures = results.filter(r => r.status === "rejected");
+        if (failures.length > 0) {
+            console.error("Failed to save space settings: ", failures);
+            setError(_t("Failed to save space settings."));
+        }
+    };
+
+    return <BaseDialog
+        title={_t("Space settings")}
+        className="mx_SpaceSettingsDialog"
+        contentId="mx_SpaceSettingsDialog"
+        onFinished={onFinished}
+        fixedWidth={false}
+    >
+        <div className="mx_SpaceSettingsDialog_content" id="mx_SpaceSettingsDialog">
+            <div>{ _t("Edit settings relating to your space.") }</div>
+
+            { error && <div className="mx_SpaceRoomView_errorText">{ error }</div> }
+
+            <SpaceBasicSettings
+                avatarUrl={avatarUrlForRoom(space, 80, 80, "crop")}
+                avatarDisabled={!canSetAvatar}
+                setAvatar={setNewAvatar}
+                name={name}
+                nameDisabled={!canSetName}
+                setName={setName}
+                topic={topic}
+                topicDisabled={!canSetTopic}
+                setTopic={setTopic}
+            />
+
+            <div>
+                { _t("Make this space private") }
+                <ToggleSwitch
+                    checked={joinRule === "private"}
+                    onChange={checked => setJoinRule(checked ? "private" : "invite")}
+                    disabled={!canSetJoinRule}
+                    aria-label={_t("Make this space private")}
+                />
+            </div>
+
+            <FormButton
+                kind="danger"
+                label={_t("Leave Space")}
+                onClick={() => {
+                    defaultDispatcher.dispatch({
+                        action: "leave_room",
+                        room_id: space.roomId,
+                    });
+                }}
+            />
+
+            <div className="mx_SpaceSettingsDialog_buttons">
+                <AccessibleButton onClick={() => Modal.createDialog(DevtoolsDialog, {roomId: space.roomId})}>
+                    { _t("View dev tools") }
+                </AccessibleButton>
+                <AccessibleButton onClick={onFinished} disabled={busy} kind="link">
+                    { _t("Cancel") }
+                </AccessibleButton>
+                <FormButton onClick={onSave} disabled={busy} label={busy ? _t("Saving...") : _t("Save Changes")} />
+            </div>
+        </div>
+    </BaseDialog>;
+};
+
+export default SpaceSettingsDialog;
+
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 5f3d293571..cd2fcf1117 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2282,6 +2282,14 @@
     "Link to selected message": "Link to selected message",
     "Copy": "Copy",
     "Command Help": "Command Help",
+    "Failed to save space settings.": "Failed to save space settings.",
+    "Space settings": "Space settings",
+    "Edit settings relating to your space.": "Edit settings relating to your space.",
+    "Make this space private": "Make this space private",
+    "Leave Space": "Leave Space",
+    "View dev tools": "View dev tools",
+    "Saving...": "Saving...",
+    "Save Changes": "Save Changes",
     "To help us prevent this in future, please <a>send us logs</a>.": "To help us prevent this in future, please <a>send us logs</a>.",
     "Missing session data": "Missing session data",
     "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.",
diff --git a/src/utils/space.ts b/src/utils/space.ts
index 98801cabd0..2ee4d0071e 100644
--- a/src/utils/space.ts
+++ b/src/utils/space.ts
@@ -19,6 +19,8 @@ import {MatrixClient} from "matrix-js-sdk/src/client";
 import {EventType} from "matrix-js-sdk/src/@types/event";
 
 import {calculateRoomVia} from "../utils/permalinks/Permalinks";
+import Modal from "../Modal";
+import SpaceSettingsDialog from "../components/views/dialogs/SpaceSettingsDialog";
 
 export const shouldShowSpaceSettings = (cli: MatrixClient, space: Room) => {
     const userId = cli.getUserId();
@@ -37,3 +39,10 @@ export const makeSpaceParentEvent = (room: Room, canonical = false) => ({
     },
     state_key: room.roomId,
 });
+
+export const showSpaceSettings = (cli: MatrixClient, space: Room) => {
+    Modal.createTrackedDialog("Space Settings", "", SpaceSettingsDialog, {
+        matrixClient: cli,
+        space,
+    }, /*className=*/null, /*isPriority=*/false, /*isStatic=*/true);
+};

From a687b9883ca42c927ec89d20ff066620a10b17ed Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 2 Mar 2021 13:28:05 +0000
Subject: [PATCH 131/420] Add a create room in space CTA to Space View

---
 res/css/structures/_SpaceRoomView.scss         | 10 ++++++++++
 src/components/structures/SpaceRoomView.tsx    | 16 +++++++++++++++-
 .../views/dialogs/CreateRoomDialog.js          |  7 +++++++
 src/i18n/strings/en_EN.json                    |  1 +
 src/utils/space.ts                             | 18 ++++++++++++++++++
 5 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/res/css/structures/_SpaceRoomView.scss b/res/css/structures/_SpaceRoomView.scss
index 0a42db130a..eaaaa2f797 100644
--- a/res/css/structures/_SpaceRoomView.scss
+++ b/res/css/structures/_SpaceRoomView.scss
@@ -188,6 +188,16 @@ $SpaceRoomViewInnerWidth: 428px;
                     }
                 }
 
+                &.mx_SpaceRoomView_landing_createButton {
+                    &::before {
+                        background-color: #368bd6;
+                    }
+
+                    &::after {
+                        mask-image: url('$(res)/img/element-icons/roomlist/explore.svg');
+                    }
+                }
+
                 &.mx_SpaceRoomView_landing_settingsButton {
                     &::before {
                         background-color: #5c56f5;
diff --git a/src/components/structures/SpaceRoomView.tsx b/src/components/structures/SpaceRoomView.tsx
index 49af14017e..4159a38cfe 100644
--- a/src/components/structures/SpaceRoomView.tsx
+++ b/src/components/structures/SpaceRoomView.tsx
@@ -46,7 +46,7 @@ import {RightPanelPhases} from "../../stores/RightPanelStorePhases";
 import {SetRightPanelPhasePayload} from "../../dispatcher/payloads/SetRightPanelPhasePayload";
 import {useStateArray} from "../../hooks/useStateArray";
 import SpacePublicShare from "../views/spaces/SpacePublicShare";
-import {shouldShowSpaceSettings, showSpaceSettings} from "../../utils/space";
+import {showCreateNewRoom, shouldShowSpaceSettings, showSpaceSettings} from "../../utils/space";
 import MemberAvatar from "../views/avatars/MemberAvatar";
 
 interface IProps {
@@ -119,6 +119,19 @@ const SpaceLanding = ({ space, onJoinButtonClicked, onRejectButtonClicked }) =>
         );
     }
 
+    const canAddRooms = myMembership === "join" && space.currentState.maySendStateEvent(EventType.SpaceChild, userId);
+
+    let addRoomButtons;
+    if (canAddRooms) {
+        addRoomButtons = <React.Fragment>
+            <AccessibleButton className="mx_SpaceRoomView_landing_createButton" onClick={() => {
+                showCreateNewRoom(cli, space);
+            }}>
+                { _t("Create a new room") }
+            </AccessibleButton>
+        </React.Fragment>;
+    }
+
     let settingsButton;
     if (shouldShowSpaceSettings(cli, space)) {
         settingsButton = <AccessibleButton className="mx_SpaceRoomView_landing_settingsButton" onClick={() => {
@@ -189,6 +202,7 @@ const SpaceLanding = ({ space, onJoinButtonClicked, onRejectButtonClicked }) =>
         { joinButtons }
         <div className="mx_SpaceRoomView_landing_adminButtons">
             { inviteButton }
+            { addRoomButtons }
             { settingsButton }
         </div>
     </div>;
diff --git a/src/components/views/dialogs/CreateRoomDialog.js b/src/components/views/dialogs/CreateRoomDialog.js
index 2b6bb5e187..0771b0ec45 100644
--- a/src/components/views/dialogs/CreateRoomDialog.js
+++ b/src/components/views/dialogs/CreateRoomDialog.js
@@ -17,6 +17,8 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
+import {Room} from "matrix-js-sdk/src/models/room";
+
 import * as sdk from '../../../index';
 import SdkConfig from '../../../SdkConfig';
 import withValidation from '../elements/Validation';
@@ -30,6 +32,7 @@ export default class CreateRoomDialog extends React.Component {
     static propTypes = {
         onFinished: PropTypes.func.isRequired,
         defaultPublic: PropTypes.bool,
+        parentSpace: PropTypes.instanceOf(Room),
     };
 
     constructor(props) {
@@ -85,6 +88,10 @@ export default class CreateRoomDialog extends React.Component {
             opts.associatedWithCommunity = CommunityPrototypeStore.instance.getSelectedCommunityId();
         }
 
+        if (this.props.parentSpace) {
+            opts.parentSpace = this.props.parentSpace;
+        }
+
         return opts;
     }
 
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index cd2fcf1117..aeef76bf22 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2570,6 +2570,7 @@
     "You have %(count)s unread notifications in a prior version of this room.|one": "You have %(count)s unread notification in a prior version of this room.",
     "Accept Invite": "Accept Invite",
     "Invite people": "Invite people",
+    "Create a new room": "Create a new room",
     "%(count)s members|other": "%(count)s members",
     "%(count)s members|one": "%(count)s member",
     "<inviter/> invited you to <name/>": "<inviter/> invited you to <name/>",
diff --git a/src/utils/space.ts b/src/utils/space.ts
index 2ee4d0071e..c995b860ee 100644
--- a/src/utils/space.ts
+++ b/src/utils/space.ts
@@ -21,6 +21,8 @@ import {EventType} from "matrix-js-sdk/src/@types/event";
 import {calculateRoomVia} from "../utils/permalinks/Permalinks";
 import Modal from "../Modal";
 import SpaceSettingsDialog from "../components/views/dialogs/SpaceSettingsDialog";
+import CreateRoomDialog from "../components/views/dialogs/CreateRoomDialog";
+import createRoom, {IOpts} from "../createRoom";
 
 export const shouldShowSpaceSettings = (cli: MatrixClient, space: Room) => {
     const userId = cli.getUserId();
@@ -46,3 +48,19 @@ export const showSpaceSettings = (cli: MatrixClient, space: Room) => {
         space,
     }, /*className=*/null, /*isPriority=*/false, /*isStatic=*/true);
 };
+
+export const showCreateNewRoom = async (cli: MatrixClient, space: Room) => {
+    const modal = Modal.createTrackedDialog<[boolean, IOpts]>(
+        "Space Landing",
+        "Create Room",
+        CreateRoomDialog,
+        {
+            defaultPublic: space.getJoinRule() === "public",
+            parentSpace: space,
+        },
+    );
+    const [shouldCreate, opts] = await modal.finished;
+    if (shouldCreate) {
+        await createRoom(opts);
+    }
+};

From e479edd47a9849a5cf12523b82eba92f1c9fe59b Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 2 Mar 2021 13:32:24 +0000
Subject: [PATCH 132/420] Add an add existing room to space CTA to Space View

---
 res/css/_components.scss                      |   1 +
 res/css/structures/_SpaceRoomView.scss        |  10 +
 .../dialogs/_AddExistingToSpaceDialog.scss    | 185 ++++++++++++++++
 src/components/structures/SpaceRoomView.tsx   |  10 +-
 .../dialogs/AddExistingToSpaceDialog.tsx      | 208 ++++++++++++++++++
 src/i18n/strings/en_EN.json                   |  11 +-
 src/utils/space.ts                            |  15 ++
 7 files changed, 438 insertions(+), 2 deletions(-)
 create mode 100644 res/css/views/dialogs/_AddExistingToSpaceDialog.scss
 create mode 100644 src/components/views/dialogs/AddExistingToSpaceDialog.tsx

diff --git a/res/css/_components.scss b/res/css/_components.scss
index db73eed3f2..8569f62de9 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -58,6 +58,7 @@
 @import "./views/context_menus/_MessageContextMenu.scss";
 @import "./views/context_menus/_StatusMessageContextMenu.scss";
 @import "./views/context_menus/_TagTileContextMenu.scss";
+@import "./views/dialogs/_AddExistingToSpaceDialog.scss";
 @import "./views/dialogs/_AddressPickerDialog.scss";
 @import "./views/dialogs/_Analytics.scss";
 @import "./views/dialogs/_BugReportDialog.scss";
diff --git a/res/css/structures/_SpaceRoomView.scss b/res/css/structures/_SpaceRoomView.scss
index eaaaa2f797..ee60389c59 100644
--- a/res/css/structures/_SpaceRoomView.scss
+++ b/res/css/structures/_SpaceRoomView.scss
@@ -188,6 +188,16 @@ $SpaceRoomViewInnerWidth: 428px;
                     }
                 }
 
+                &.mx_SpaceRoomView_landing_addButton {
+                    &::before {
+                        background-color: #ac3ba8;
+                    }
+
+                    &::after {
+                        mask-image: url('$(res)/img/element-icons/roomlist/explore.svg');
+                    }
+                }
+
                 &.mx_SpaceRoomView_landing_createButton {
                     &::before {
                         background-color: #368bd6;
diff --git a/res/css/views/dialogs/_AddExistingToSpaceDialog.scss b/res/css/views/dialogs/_AddExistingToSpaceDialog.scss
new file mode 100644
index 0000000000..0c9d8e3840
--- /dev/null
+++ b/res/css/views/dialogs/_AddExistingToSpaceDialog.scss
@@ -0,0 +1,185 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.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_AddExistingToSpaceDialog_wrapper {
+    .mx_Dialog {
+        display: flex;
+        flex-direction: column;
+    }
+}
+
+.mx_AddExistingToSpaceDialog {
+    width: 480px;
+    color: $primary-fg-color;
+    display: flex;
+    flex-direction: column;
+    flex-wrap: nowrap;
+    min-height: 0;
+
+    .mx_Dialog_title {
+        display: flex;
+
+        .mx_BaseAvatar {
+            display: inline-flex;
+            margin: 5px 16px 5px 5px;
+            vertical-align: middle;
+        }
+
+        .mx_BaseAvatar_image {
+            border-radius: 8px;
+            margin: 0;
+            vertical-align: unset;
+        }
+
+        > div {
+            > h1 {
+                font-weight: $font-semi-bold;
+                font-size: $font-18px;
+                line-height: $font-22px;
+                margin: 0;
+            }
+
+            .mx_AddExistingToSpaceDialog_onlySpace {
+                color: $secondary-fg-color;
+                font-size: $font-15px;
+                line-height: $font-24px;
+            }
+        }
+
+        .mx_Dropdown_input {
+            border: none;
+
+            > .mx_Dropdown_option {
+                padding-left: 0;
+                flex: unset;
+                height: unset;
+                color: $secondary-fg-color;
+                font-size: $font-15px;
+                line-height: $font-24px;
+
+                .mx_BaseAvatar {
+                    display: none;
+                }
+            }
+
+            .mx_Dropdown_menu {
+                .mx_AddExistingToSpaceDialog_dropdownOptionActive {
+                    color: $accent-color;
+                    padding-right: 32px;
+                    position: relative;
+
+                    &::before {
+                        content: '';
+                        width: 20px;
+                        height: 20px;
+                        top: 8px;
+                        right: 0;
+                        position: absolute;
+                        mask-position: center;
+                        mask-size: contain;
+                        mask-repeat: no-repeat;
+                        background-color: $accent-color;
+                        mask-image: url('$(res)/img/element-icons/roomlist/checkmark.svg');
+                    }
+                }
+            }
+        }
+    }
+
+    .mx_SearchBox {
+        margin: 0;
+    }
+
+    .mx_AddExistingToSpaceDialog_errorText {
+        font-weight: $font-semi-bold;
+        font-size: $font-12px;
+        line-height: $font-15px;
+        color: $notice-primary-color;
+        margin-bottom: 28px;
+    }
+
+    .mx_AddExistingToSpaceDialog_content {
+        .mx_AddExistingToSpaceDialog_noResults {
+            margin-top: 24px;
+        }
+    }
+
+    .mx_AddExistingToSpaceDialog_section {
+        margin-top: 24px;
+
+        > h3 {
+            margin: 0;
+            color: $secondary-fg-color;
+            font-size: $font-12px;
+            font-weight: $font-semi-bold;
+            line-height: $font-15px;
+        }
+
+        .mx_AddExistingToSpaceDialog_entry {
+            display: flex;
+            margin-top: 12px;
+
+            .mx_BaseAvatar {
+                margin-right: 12px;
+            }
+
+            .mx_AddExistingToSpaceDialog_entry_name {
+                font-size: $font-15px;
+                line-height: 30px;
+                flex-grow: 1;
+            }
+
+            .mx_FormButton {
+                min-width: 92px;
+                font-weight: normal;
+                box-sizing: border-box;
+            }
+        }
+    }
+
+    .mx_AddExistingToSpaceDialog_section_spaces {
+        .mx_BaseAvatar_image {
+            border-radius: 8px;
+        }
+    }
+
+    .mx_AddExistingToSpaceDialog_footer {
+        display: flex;
+        margin-top: 32px;
+
+        > span {
+            flex-grow: 1;
+            font-size: $font-12px;
+            line-height: $font-15px;
+
+            > * {
+                vertical-align: middle;
+            }
+        }
+
+        .mx_AccessibleButton {
+            display: inline-block;
+        }
+
+        .mx_AccessibleButton_kind_link {
+            padding: 0;
+        }
+    }
+
+    .mx_FormButton {
+        padding: 8px 22px;
+    }
+}
diff --git a/src/components/structures/SpaceRoomView.tsx b/src/components/structures/SpaceRoomView.tsx
index 4159a38cfe..f1a8a4d71b 100644
--- a/src/components/structures/SpaceRoomView.tsx
+++ b/src/components/structures/SpaceRoomView.tsx
@@ -46,7 +46,7 @@ import {RightPanelPhases} from "../../stores/RightPanelStorePhases";
 import {SetRightPanelPhasePayload} from "../../dispatcher/payloads/SetRightPanelPhasePayload";
 import {useStateArray} from "../../hooks/useStateArray";
 import SpacePublicShare from "../views/spaces/SpacePublicShare";
-import {showCreateNewRoom, shouldShowSpaceSettings, showSpaceSettings} from "../../utils/space";
+import {showAddExistingRooms, showCreateNewRoom, shouldShowSpaceSettings, showSpaceSettings} from "../../utils/space";
 import MemberAvatar from "../views/avatars/MemberAvatar";
 
 interface IProps {
@@ -124,6 +124,14 @@ const SpaceLanding = ({ space, onJoinButtonClicked, onRejectButtonClicked }) =>
     let addRoomButtons;
     if (canAddRooms) {
         addRoomButtons = <React.Fragment>
+            <AccessibleButton className="mx_SpaceRoomView_landing_addButton" onClick={async () => {
+                const [added] = await showAddExistingRooms(cli, space);
+                if (added) {
+                    // TODO update rooms shown once we show hierarchy here
+                }
+            }}>
+                { _t("Add existing rooms & spaces") }
+            </AccessibleButton>
             <AccessibleButton className="mx_SpaceRoomView_landing_createButton" onClick={() => {
                 showCreateNewRoom(cli, space);
             }}>
diff --git a/src/components/views/dialogs/AddExistingToSpaceDialog.tsx b/src/components/views/dialogs/AddExistingToSpaceDialog.tsx
new file mode 100644
index 0000000000..66efaefd9d
--- /dev/null
+++ b/src/components/views/dialogs/AddExistingToSpaceDialog.tsx
@@ -0,0 +1,208 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, {useState} from "react";
+import classNames from "classnames";
+import {Room} from "matrix-js-sdk/src/models/room";
+import {MatrixClient} from "matrix-js-sdk/src/client";
+
+import {_t} from '../../../languageHandler';
+import {IDialogProps} from "./IDialogProps";
+import BaseDialog from "./BaseDialog";
+import FormButton from "../elements/FormButton";
+import Dropdown from "../elements/Dropdown";
+import SearchBox from "../../structures/SearchBox";
+import SpaceStore from "../../../stores/SpaceStore";
+import RoomAvatar from "../avatars/RoomAvatar";
+import {getDisplayAliasForRoom} from "../../../Rooms";
+import AccessibleButton from "../elements/AccessibleButton";
+import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
+import {allSettled} from "../../../utils/promise";
+import DMRoomMap from "../../../utils/DMRoomMap";
+import {calculateRoomVia} from "../../../utils/permalinks/Permalinks";
+import StyledCheckbox from "../elements/StyledCheckbox";
+
+interface IProps extends IDialogProps {
+    matrixClient: MatrixClient;
+    space: Room;
+    onCreateRoomClick(cli: MatrixClient, space: Room): void;
+}
+
+const Entry = ({ room, checked, onChange }) => {
+    return <div className="mx_AddExistingToSpaceDialog_entry">
+        <RoomAvatar room={room} height={32} width={32} />
+        <span className="mx_AddExistingToSpaceDialog_entry_name">{ room.name }</span>
+        <StyledCheckbox onChange={(e) => onChange(e.target.checked)} checked={checked} />
+    </div>;
+};
+
+const AddExistingToSpaceDialog: React.FC<IProps> = ({ matrixClient: cli, space, onCreateRoomClick, onFinished }) => {
+    const [query, setQuery] = useState("");
+    const lcQuery = query.toLowerCase();
+
+    const [selectedSpace, setSelectedSpace] = useState(space);
+    const [selectedToAdd, setSelectedToAdd] = useState(new Set<Room>());
+
+    const existingSubspaces = SpaceStore.instance.getChildSpaces(space.roomId);
+    const existingSubspacesSet = new Set(existingSubspaces);
+    const spaces = SpaceStore.instance.getSpaces().filter(s => {
+        return !existingSubspacesSet.has(s) // not already in space
+            && space !== s // not the top-level space
+            && selectedSpace !== s // not the selected space
+            && s.name.toLowerCase().includes(lcQuery); // contains query
+    });
+
+    const existingRooms = SpaceStore.instance.getChildRooms(space.roomId);
+    const existingRoomsSet = new Set(existingRooms);
+    const rooms = cli.getVisibleRooms().filter(room => {
+        return !existingRoomsSet.has(room) // not already in space
+            && room.name.toLowerCase().includes(lcQuery) // contains query
+            && !DMRoomMap.shared().getUserIdForRoomId(room.roomId); // not a DM
+    });
+
+    const [busy, setBusy] = useState(false);
+    const [error, setError] = useState("");
+
+    let spaceOptionSection;
+    if (existingSubspacesSet.size > 0) {
+        const options = [space, ...existingSubspaces].map((space) => {
+            const classes = classNames("mx_AddExistingToSpaceDialog_dropdownOption", {
+                mx_AddExistingToSpaceDialog_dropdownOptionActive: space === selectedSpace,
+            });
+            return <div key={space.roomId} className={classes}>
+                <RoomAvatar room={space} width={24} height={24} />
+                { space.name || getDisplayAliasForRoom(space) || space.roomId }
+            </div>;
+        });
+
+        spaceOptionSection = (
+            <Dropdown
+                id="mx_SpaceSelectDropdown"
+                onOptionChange={(key: string) => {
+                    setSelectedSpace(existingSubspaces.find(space => space.roomId === key) || space);
+                }}
+                value={selectedSpace.roomId}
+                label={_t("Space selection")}
+            >
+                { options }
+            </Dropdown>
+        );
+    } else {
+        spaceOptionSection = <div className="mx_AddExistingToSpaceDialog_onlySpace">
+            { space.name || getDisplayAliasForRoom(space) || space.roomId }
+        </div>;
+    }
+
+    const title = <React.Fragment>
+        <RoomAvatar room={selectedSpace} height={40} width={40} />
+        <div>
+            <h1>{ _t("Add existing spaces/rooms") }</h1>
+            { spaceOptionSection }
+        </div>
+    </React.Fragment>;
+
+    return <BaseDialog
+        title={title}
+        className="mx_AddExistingToSpaceDialog"
+        contentId="mx_AddExistingToSpaceDialog"
+        onFinished={onFinished}
+        fixedWidth={false}
+    >
+        { error && <div className="mx_AddExistingToSpaceDialog_errorText">{ error }</div> }
+
+        <SearchBox
+            className="mx_textinput_icon mx_textinput_search"
+            placeholder={ _t("Filter your rooms and spaces") }
+            onSearch={setQuery}
+        />
+        <AutoHideScrollbar className="mx_AddExistingToSpaceDialog_content" id="mx_AddExistingToSpaceDialog">
+            { spaces.length > 0 ? (
+                <div className="mx_AddExistingToSpaceDialog_section mx_AddExistingToSpaceDialog_section_spaces">
+                    <h3>{ _t("Spaces") }</h3>
+                    { spaces.map(space => {
+                        return <Entry
+                            key={space.roomId}
+                            room={space}
+                            checked={selectedToAdd.has(space)}
+                            onChange={(checked) => {
+                                if (checked) {
+                                    selectedToAdd.add(space);
+                                } else {
+                                    selectedToAdd.delete(space);
+                                }
+                                setSelectedToAdd(new Set(selectedToAdd));
+                            }}
+                        />;
+                    }) }
+                </div>
+            ) : null }
+
+            { rooms.length > 0 ? (
+                <div className="mx_AddExistingToSpaceDialog_section">
+                    <h3>{ _t("Rooms") }</h3>
+                    { rooms.map(room => {
+                        return <Entry
+                            key={room.roomId}
+                            room={room}
+                            checked={selectedToAdd.has(room)}
+                            onChange={(checked) => {
+                                if (checked) {
+                                    selectedToAdd.add(room);
+                                } else {
+                                    selectedToAdd.delete(room);
+                                }
+                                setSelectedToAdd(new Set(selectedToAdd));
+                            }}
+                        />;
+                    }) }
+                </div>
+            ) : undefined }
+
+            { spaces.length + rooms.length < 1 ? <span className="mx_AddExistingToSpaceDialog_noResults">
+                { _t("No results") }
+            </span> : undefined }
+        </AutoHideScrollbar>
+
+        <div className="mx_AddExistingToSpaceDialog_footer">
+            <span>
+                <div>{ _t("Don't want to add an existing room?") }</div>
+                <AccessibleButton onClick={() => onCreateRoomClick(cli, space)} kind="link">
+                    { _t("Create a new room") }
+                </AccessibleButton>
+            </span>
+
+            <FormButton
+                label={busy ? _t("Applying...") : _t("Apply")}
+                disabled={busy || selectedToAdd.size < 1}
+                onClick={async () => {
+                    setBusy(true);
+                    try {
+                        await allSettled(Array.from(selectedToAdd).map((room) =>
+                            SpaceStore.instance.addRoomToSpace(space, room.roomId, calculateRoomVia(room))));
+                        onFinished(true);
+                    } catch (e) {
+                        console.error("Failed to add rooms to space", e);
+                        setError(_t("Failed to add rooms to space"));
+                    }
+                    setBusy(false);
+                }}
+            />
+        </div>
+    </BaseDialog>;
+};
+
+export default AddExistingToSpaceDialog;
+
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index aeef76bf22..bb800b2af2 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1978,6 +1978,15 @@
     "Add a new server...": "Add a new server...",
     "%(networkName)s rooms": "%(networkName)s rooms",
     "Matrix rooms": "Matrix rooms",
+    "Space selection": "Space selection",
+    "Add existing spaces/rooms": "Add existing spaces/rooms",
+    "Filter your rooms and spaces": "Filter your rooms and spaces",
+    "Spaces": "Spaces",
+    "Don't want to add an existing room?": "Don't want to add an existing room?",
+    "Create a new room": "Create a new room",
+    "Applying...": "Applying...",
+    "Apply": "Apply",
+    "Failed to add rooms to space": "Failed to add rooms to space",
     "Matrix ID": "Matrix ID",
     "Matrix Room ID": "Matrix Room ID",
     "email address": "email address",
@@ -2570,7 +2579,7 @@
     "You have %(count)s unread notifications in a prior version of this room.|one": "You have %(count)s unread notification in a prior version of this room.",
     "Accept Invite": "Accept Invite",
     "Invite people": "Invite people",
-    "Create a new room": "Create a new room",
+    "Add existing rooms & spaces": "Add existing rooms & spaces",
     "%(count)s members|other": "%(count)s members",
     "%(count)s members|one": "%(count)s member",
     "<inviter/> invited you to <name/>": "<inviter/> invited you to <name/>",
diff --git a/src/utils/space.ts b/src/utils/space.ts
index c995b860ee..bc31829f45 100644
--- a/src/utils/space.ts
+++ b/src/utils/space.ts
@@ -21,6 +21,7 @@ import {EventType} from "matrix-js-sdk/src/@types/event";
 import {calculateRoomVia} from "../utils/permalinks/Permalinks";
 import Modal from "../Modal";
 import SpaceSettingsDialog from "../components/views/dialogs/SpaceSettingsDialog";
+import AddExistingToSpaceDialog from "../components/views/dialogs/AddExistingToSpaceDialog";
 import CreateRoomDialog from "../components/views/dialogs/CreateRoomDialog";
 import createRoom, {IOpts} from "../createRoom";
 
@@ -49,6 +50,20 @@ export const showSpaceSettings = (cli: MatrixClient, space: Room) => {
     }, /*className=*/null, /*isPriority=*/false, /*isStatic=*/true);
 };
 
+export const showAddExistingRooms = async (cli: MatrixClient, space: Room) => {
+    return Modal.createTrackedDialog(
+        "Space Landing",
+        "Add Existing",
+        AddExistingToSpaceDialog,
+        {
+            matrixClient: cli,
+            onCreateRoomClick: showCreateNewRoom,
+            space,
+        },
+        "mx_AddExistingToSpaceDialog_wrapper",
+    ).finished;
+};
+
 export const showCreateNewRoom = async (cli: MatrixClient, space: Room) => {
     const modal = Modal.createTrackedDialog<[boolean, IOpts]>(
         "Space Landing",

From 4e93452275ed7ed8224d14a62c8711a85fdc6e6f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 2 Mar 2021 14:02:03 +0000
Subject: [PATCH 133/420] Tweak resizer collapse distributor behaviour to work
 with the expanding space panel

---
 src/components/structures/LoggedInView.tsx | 12 +++++++++++-
 src/resizer/distributors/collapse.ts       |  9 ++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx
index 1694b4bcf5..4e768bd9e5 100644
--- a/src/components/structures/LoggedInView.tsx
+++ b/src/components/structures/LoggedInView.tsx
@@ -223,7 +223,14 @@ class LoggedInView extends React.Component<IProps, IState> {
         let size;
         let collapsed;
         const collapseConfig: ICollapseConfig = {
-            toggleSize: 260 - 50,
+            // TODO: the space panel currently does not have a fixed width,
+            // just the headers at each level have a max-width of 150px
+            // Taking 222px for the space panel for now,
+            // so this will look slightly off for now,
+            // depending on the depth of your space tree.
+            // To fix this, we'll need to turn toggleSize
+            // into a callback so it can be measured when starting the resize operation
+            toggleSize: 222 + 68,
             onCollapsed: (_collapsed) => {
                 collapsed = _collapsed;
                 if (_collapsed) {
@@ -244,6 +251,9 @@ class LoggedInView extends React.Component<IProps, IState> {
                 if (!collapsed) window.localStorage.setItem("mx_lhs_size", '' + size);
                 this.props.resizeNotifier.stopResizing();
             },
+            isItemCollapsed: domNode => {
+                return domNode.classList.contains("mx_LeftPanel_minimized");
+            },
         };
         const resizer = new Resizer(this._resizeContainer.current, CollapseDistributor, collapseConfig);
         resizer.setClassNames({
diff --git a/src/resizer/distributors/collapse.ts b/src/resizer/distributors/collapse.ts
index ddf3bd687e..f8db0be52c 100644
--- a/src/resizer/distributors/collapse.ts
+++ b/src/resizer/distributors/collapse.ts
@@ -22,6 +22,7 @@ import Sizer from "../sizer";
 export interface ICollapseConfig extends IConfig {
     toggleSize: number;
     onCollapsed?(collapsed: boolean, id: string, element: HTMLElement): void;
+    isItemCollapsed(element: HTMLElement): boolean;
 }
 
 class CollapseItem extends ResizeItem<ICollapseConfig> {
@@ -31,6 +32,11 @@ class CollapseItem extends ResizeItem<ICollapseConfig> {
             callback(collapsed, this.id, this.domNode);
         }
     }
+
+    get isCollapsed() {
+        const isItemCollapsed = this.resizer.config.isItemCollapsed;
+        return isItemCollapsed(this.domNode);
+    }
 }
 
 export default class CollapseDistributor extends FixedDistributor<ICollapseConfig, CollapseItem> {
@@ -39,11 +45,12 @@ export default class CollapseDistributor extends FixedDistributor<ICollapseConfi
     }
 
     private readonly toggleSize: number;
-    private isCollapsed = false;
+    private isCollapsed: boolean;
 
     constructor(item: CollapseItem) {
         super(item);
         this.toggleSize = item.resizer?.config?.toggleSize;
+        this.isCollapsed = item.isCollapsed;
     }
 
     public resize(newSize: number) {

From faf7a4b8bce57d7d2654b49b9413762e1e876daf Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 2 Mar 2021 14:11:38 +0000
Subject: [PATCH 134/420] Initial Space room directory view

---
 res/css/_components.scss                      |   1 +
 res/css/structures/_SpaceRoomDirectory.scss   | 231 +++++++
 src/components/structures/MatrixChat.tsx      |  17 +-
 .../structures/SpaceRoomDirectory.tsx         | 572 ++++++++++++++++++
 src/i18n/strings/en_EN.json                   |  10 +
 5 files changed, 827 insertions(+), 4 deletions(-)
 create mode 100644 res/css/structures/_SpaceRoomDirectory.scss
 create mode 100644 src/components/structures/SpaceRoomDirectory.tsx

diff --git a/res/css/_components.scss b/res/css/_components.scss
index 8569f62de9..daa7016623 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -28,6 +28,7 @@
 @import "./structures/_ScrollPanel.scss";
 @import "./structures/_SearchBox.scss";
 @import "./structures/_SpacePanel.scss";
+@import "./structures/_SpaceRoomDirectory.scss";
 @import "./structures/_SpaceRoomView.scss";
 @import "./structures/_TabbedView.scss";
 @import "./structures/_ToastContainer.scss";
diff --git a/res/css/structures/_SpaceRoomDirectory.scss b/res/css/structures/_SpaceRoomDirectory.scss
new file mode 100644
index 0000000000..5cb91820cf
--- /dev/null
+++ b/res/css/structures/_SpaceRoomDirectory.scss
@@ -0,0 +1,231 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.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_SpaceRoomDirectory_dialogWrapper > .mx_Dialog {
+    max-width: 960px;
+    height: 100%;
+}
+
+.mx_SpaceRoomDirectory {
+    height: 100%;
+    margin-bottom: 12px;
+    color: $primary-fg-color;
+    word-break: break-word;
+    display: flex;
+    flex-direction: column;
+
+    .mx_Dialog_title {
+        display: flex;
+
+        .mx_BaseAvatar {
+            margin-right: 16px;
+        }
+
+        .mx_BaseAvatar_image {
+            border-radius: 8px;
+        }
+
+        > div {
+            > h1 {
+                font-weight: $font-semi-bold;
+                font-size: $font-18px;
+                line-height: $font-22px;
+                margin: 0;
+            }
+
+            > div {
+                color: $secondary-fg-color;
+                font-size: $font-15px;
+                line-height: $font-24px;
+            }
+        }
+    }
+
+    .mx_Dialog_content {
+        // TODO fix scrollbar
+        //display: flex;
+        //flex-direction: column;
+        //height: calc(100% - 80px);
+
+        .mx_AccessibleButton_kind_link {
+            padding: 0;
+        }
+
+        .mx_SearchBox {
+            margin: 24px 0 28px;
+        }
+
+        .mx_SpaceRoomDirectory_listHeader {
+            display: flex;
+            font-size: $font-12px;
+            line-height: $font-15px;
+            color: $secondary-fg-color;
+
+            .mx_FormButton {
+                margin-bottom: 8px;
+            }
+
+            > span {
+                margin: auto 0 0 auto;
+            }
+        }
+    }
+}
+
+.mx_SpaceRoomDirectory_list {
+    margin-top: 8px;
+
+    .mx_SpaceRoomDirectory_roomCount {
+        > h3 {
+            display: inline;
+            font-weight: $font-semi-bold;
+            font-size: $font-18px;
+            line-height: $font-22px;
+            color: $primary-fg-color;
+        }
+
+        > span {
+            margin-left: 8px;
+            font-size: $font-15px;
+            line-height: $font-24px;
+            color: $secondary-fg-color;
+        }
+    }
+
+    .mx_SpaceRoomDirectory_subspace {
+        margin-top: 8px;
+
+        .mx_SpaceRoomDirectory_subspace_info {
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            margin-bottom: 8px;
+            color: $secondary-fg-color;
+            font-weight: $font-semi-bold;
+            font-size: $font-12px;
+            line-height: $font-15px;
+
+            .mx_BaseAvatar {
+                margin-right: 12px;
+                vertical-align: middle;
+            }
+
+            .mx_BaseAvatar_image {
+                border-radius: 8px;
+            }
+
+            .mx_SpaceRoomDirectory_actions {
+                text-align: right;
+                height: min-content;
+                margin-left: auto;
+                margin-right: 16px;
+            }
+        }
+
+        .mx_SpaceRoomDirectory_subspace_children {
+            margin-left: 12px;
+            border-left: 2px solid $space-button-outline-color;
+            padding-left: 24px;
+        }
+    }
+
+    .mx_SpaceRoomDirectory_roomTile {
+        padding: 16px;
+        border-radius: 8px;
+        border: 1px solid $space-button-outline-color;
+        margin: 8px 0 16px;
+        display: flex;
+        min-height: 76px;
+        box-sizing: border-box;
+
+        &.mx_AccessibleButton:hover {
+            background-color: rgba(141, 151, 165, 0.1);
+        }
+
+        .mx_BaseAvatar {
+            margin-right: 16px;
+            margin-top: 6px;
+        }
+
+        .mx_SpaceRoomDirectory_roomTile_info {
+            display: inline-block;
+            font-size: $font-15px;
+            flex-grow: 1;
+            height: min-content;
+            margin: auto 0;
+
+            .mx_SpaceRoomDirectory_roomTile_name {
+                font-weight: $font-semi-bold;
+                line-height: $font-18px;
+            }
+            .mx_SpaceRoomDirectory_roomTile_topic {
+                line-height: $font-24px;
+                color: $secondary-fg-color;
+            }
+        }
+
+        .mx_SpaceRoomDirectory_roomTile_memberCount {
+            position: relative;
+            margin: auto 0 auto 24px;
+            padding: 0 0 0 28px;
+            line-height: $font-24px;
+            display: inline-block;
+            width: 32px;
+
+            &::before {
+                position: absolute;
+                content: '';
+                width: 24px;
+                height: 24px;
+                top: 0;
+                left: 0;
+                mask-position: center;
+                mask-repeat: no-repeat;
+                mask-size: contain;
+                background-color: $secondary-fg-color;
+                mask-image: url('$(res)/img/element-icons/community-members.svg');
+            }
+        }
+
+        .mx_SpaceRoomDirectory_actions {
+            width: 180px;
+            text-align: right;
+            height: min-content;
+            margin: auto 0 auto 28px;
+
+            .mx_AccessibleButton {
+                vertical-align: middle;
+
+                & + .mx_AccessibleButton {
+                    margin-left: 24px;
+                }
+            }
+        }
+    }
+
+    .mx_SpaceRoomDirectory_actions {
+        .mx_SpaceRoomDirectory_actionsText {
+            font-weight: normal;
+            font-size: $font-12px;
+            line-height: $font-15px;
+            color: $secondary-fg-color;
+        }
+
+        .mx_Checkbox {
+            display: inline-block;
+        }
+    }
+}
diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index 83b3565738..1700b627db 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -82,6 +82,8 @@ import {UIFeature} from "../../settings/UIFeature";
 import { CommunityPrototypeStore } from "../../stores/CommunityPrototypeStore";
 import DialPadModal from "../views/voip/DialPadModal";
 import { showToast as showMobileGuideToast } from '../../toasts/MobileGuideToast';
+import SpaceStore from "../../stores/SpaceStore";
+import SpaceRoomDirectory from "./SpaceRoomDirectory";
 
 /** constants for MatrixChat.state.view */
 export enum Views {
@@ -691,10 +693,17 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 break;
             }
             case Action.ViewRoomDirectory: {
-                const RoomDirectory = sdk.getComponent("structures.RoomDirectory");
-                Modal.createTrackedDialog('Room directory', '', RoomDirectory, {
-                    initialText: payload.initialText,
-                }, 'mx_RoomDirectory_dialogWrapper', false, true);
+                if (SpaceStore.instance.activeSpace) {
+                    Modal.createTrackedDialog("Space room directory", "", SpaceRoomDirectory, {
+                        space: SpaceStore.instance.activeSpace,
+                        initialText: payload.initialText,
+                    }, "mx_SpaceRoomDirectory_dialogWrapper", false, true);
+                } else {
+                    const RoomDirectory = sdk.getComponent("structures.RoomDirectory");
+                    Modal.createTrackedDialog('Room directory', '', RoomDirectory, {
+                        initialText: payload.initialText,
+                    }, 'mx_RoomDirectory_dialogWrapper', false, true);
+                }
 
                 // View the welcome or home page if we need something to look at
                 this.viewSomethingBehindModal();
diff --git a/src/components/structures/SpaceRoomDirectory.tsx b/src/components/structures/SpaceRoomDirectory.tsx
new file mode 100644
index 0000000000..7f7b9dbb99
--- /dev/null
+++ b/src/components/structures/SpaceRoomDirectory.tsx
@@ -0,0 +1,572 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.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, {useMemo, useRef, useState} from "react";
+import Room from "matrix-js-sdk/src/models/room";
+import MatrixEvent from "matrix-js-sdk/src/models/event";
+import {EventType, RoomType} from "matrix-js-sdk/src/@types/event";
+
+import {MatrixClientPeg} from "../../MatrixClientPeg";
+import dis from "../../dispatcher/dispatcher";
+import {_t} from "../../languageHandler";
+import AccessibleButton from "../views/elements/AccessibleButton";
+import BaseDialog from "../views/dialogs/BaseDialog";
+import FormButton from "../views/elements/FormButton";
+import SearchBox from "./SearchBox";
+import RoomAvatar from "../views/avatars/RoomAvatar";
+import RoomName from "../views/elements/RoomName";
+import {useAsyncMemo} from "../../hooks/useAsyncMemo";
+import {shouldShowSpaceSettings} from "../../utils/space";
+import {EnhancedMap} from "../../utils/maps";
+import StyledCheckbox from "../views/elements/StyledCheckbox";
+import AutoHideScrollbar from "./AutoHideScrollbar";
+import BaseAvatar from "../views/avatars/BaseAvatar";
+
+interface IProps {
+    space: Room;
+    initialText?: string;
+    onFinished(): void;
+}
+
+/* eslint-disable camelcase */
+export interface ISpaceSummaryRoom {
+    canonical_alias?: string;
+    aliases: string[];
+    avatar_url?: string;
+    guest_can_join: boolean;
+    name?: string;
+    num_joined_members: number
+    room_id: string;
+    topic?: string;
+    world_readable: boolean;
+    num_refs: number;
+    room_type: string;
+}
+
+export interface ISpaceSummaryEvent {
+    room_id: string;
+    event_id: string;
+    origin_server_ts: number;
+    type: string;
+    state_key: string;
+    content: {
+        order?: string;
+        auto_join?: boolean;
+        via?: string;
+    };
+}
+/* eslint-enable camelcase */
+
+interface ISubspaceProps {
+    space: ISpaceSummaryRoom;
+    event?: MatrixEvent;
+    editing?: boolean;
+    onPreviewClick?(): void;
+    queueAction?(action: IAction): void;
+    onJoinClick?(): void;
+}
+
+const SubSpace: React.FC<ISubspaceProps> = ({
+    space,
+    editing,
+    event,
+    queueAction,
+    onJoinClick,
+    onPreviewClick,
+    children,
+}) => {
+    const name = space.name || space.canonical_alias || space.aliases?.[0] || _t("Unnamed Space");
+
+    const evContent = event?.getContent();
+    const [autoJoin, _setAutoJoin] = useState(evContent?.auto_join);
+    const [removed, _setRemoved] = useState(!evContent?.via);
+
+    const cli = MatrixClientPeg.get();
+    const cliRoom = cli.getRoom(space.room_id);
+    const myMembership = cliRoom?.getMyMembership();
+
+    // TODO DRY code
+    let actions;
+    if (editing && queueAction) {
+        if (event && cli.getRoom(event.getRoomId())?.currentState.maySendStateEvent(event.getType(), cli.getUserId())) {
+            const setAutoJoin = () => {
+                _setAutoJoin(v => {
+                    queueAction({
+                        event,
+                        removed,
+                        autoJoin: !v,
+                    });
+                    return !v;
+                });
+            };
+
+            const setRemoved = () => {
+                _setRemoved(v => {
+                    queueAction({
+                        event,
+                        removed: !v,
+                        autoJoin,
+                    });
+                    return !v;
+                });
+            };
+
+            if (removed) {
+                actions = <React.Fragment>
+                    <FormButton kind="danger" onClick={setRemoved} label={_t("Undo")} />
+                </React.Fragment>;
+            } else {
+                actions = <React.Fragment>
+                    <FormButton kind="danger" onClick={setRemoved} label={_t("Remove from Space")} />
+                    <StyledCheckbox checked={autoJoin} onChange={setAutoJoin} />
+                </React.Fragment>;
+            }
+        } else {
+            actions = <span className="mx_SpaceRoomDirectory_actionsText">
+                { _t("No permissions")}
+            </span>;
+        }
+        // TODO confirm remove from space click behaviour here
+    } else {
+        if (myMembership === "join") {
+            actions = <span className="mx_SpaceRoomDirectory_actionsText">
+                { _t("You're in this space")}
+            </span>;
+        } else if (onJoinClick) {
+            actions = <React.Fragment>
+                <AccessibleButton onClick={onPreviewClick} kind="link">
+                    { _t("Preview") }
+                </AccessibleButton>
+                <FormButton onClick={onJoinClick} label={_t("Join")} />
+            </React.Fragment>
+        }
+    }
+
+    let url: string;
+    if (space.avatar_url) {
+        url = MatrixClientPeg.get().mxcUrlToHttp(space.avatar_url,
+            Math.floor(24 * window.devicePixelRatio),
+            Math.floor(24 * window.devicePixelRatio),
+            "crop");
+    }
+
+    return <div className="mx_SpaceRoomDirectory_subspace">
+        <div className="mx_SpaceRoomDirectory_subspace_info">
+            <BaseAvatar name={name} idName={space.room_id} url={url} width={24} height={24} />
+            { name }
+
+            <div className="mx_SpaceRoomDirectory_actions">
+                { actions }
+            </div>
+        </div>
+        <div className="mx_SpaceRoomDirectory_subspace_children">
+            { children }
+        </div>
+    </div>
+};
+
+interface IAction {
+    event: MatrixEvent;
+    removed: boolean;
+    autoJoin: boolean;
+}
+
+interface IRoomTileProps {
+    room: ISpaceSummaryRoom;
+    event?: MatrixEvent;
+    editing?: boolean;
+    onPreviewClick(): void;
+    queueAction?(action: IAction): void;
+    onJoinClick?(): void;
+}
+
+const RoomTile = ({ room, event, editing, queueAction, onPreviewClick, onJoinClick }: IRoomTileProps) => {
+    const name = room.name || room.canonical_alias || room.aliases?.[0] || _t("Unnamed Room");
+
+    const evContent = event?.getContent();
+    const [autoJoin, _setAutoJoin] = useState(evContent?.auto_join);
+    const [removed, _setRemoved] = useState(!evContent?.via);
+
+    const cli = MatrixClientPeg.get();
+    const cliRoom = cli.getRoom(room.room_id);
+    const myMembership = cliRoom?.getMyMembership();
+
+    let actions;
+    if (editing && queueAction) {
+        if (event && cli.getRoom(event.getRoomId())?.currentState.maySendStateEvent(event.getType(), cli.getUserId())) {
+            const setAutoJoin = () => {
+                _setAutoJoin(v => {
+                    queueAction({
+                        event,
+                        removed,
+                        autoJoin: !v,
+                    });
+                    return !v;
+                });
+            };
+
+            const setRemoved = () => {
+                _setRemoved(v => {
+                    queueAction({
+                        event,
+                        removed: !v,
+                        autoJoin,
+                    });
+                    return !v;
+                });
+            };
+
+            if (removed) {
+                actions = <React.Fragment>
+                    <FormButton kind="danger" onClick={setRemoved} label={_t("Undo")} />
+                </React.Fragment>;
+            } else {
+                actions = <React.Fragment>
+                    <FormButton kind="danger" onClick={setRemoved} label={_t("Remove from Space")} />
+                    <StyledCheckbox checked={autoJoin} onChange={setAutoJoin} />
+                </React.Fragment>;
+            }
+        } else {
+            actions = <span className="mx_SpaceRoomDirectory_actionsText">
+                { _t("No permissions")}
+            </span>;
+        }
+        // TODO confirm remove from space click behaviour here
+    } else {
+        if (myMembership === "join") {
+            actions = <span className="mx_SpaceRoomDirectory_actionsText">
+                { _t("You're in this room")}
+            </span>;
+        } else if (onJoinClick) {
+            actions = <React.Fragment>
+                <AccessibleButton onClick={onPreviewClick} kind="link">
+                    { _t("Preview") }
+                </AccessibleButton>
+                <FormButton onClick={onJoinClick} label={_t("Join")} />
+            </React.Fragment>
+        }
+    }
+
+    let url: string;
+    if (room.avatar_url) {
+        url = cli.mxcUrlToHttp(room.avatar_url,
+            Math.floor(32 * window.devicePixelRatio),
+            Math.floor(32 * window.devicePixelRatio),
+            "crop");
+    }
+
+    const content = <React.Fragment>
+        <BaseAvatar name={name} idName={room.room_id} url={url} width={32} height={32} />
+
+        <div className="mx_SpaceRoomDirectory_roomTile_info">
+            <div className="mx_SpaceRoomDirectory_roomTile_name">
+                { name }
+            </div>
+            <div className="mx_SpaceRoomDirectory_roomTile_topic">
+                { room.topic }
+            </div>
+        </div>
+        <div className="mx_SpaceRoomDirectory_roomTile_memberCount">
+            { room.num_joined_members }
+        </div>
+
+        <div className="mx_SpaceRoomDirectory_actions">
+            { actions }
+        </div>
+    </React.Fragment>;
+
+    if (editing) {
+        return <div className="mx_SpaceRoomDirectory_roomTile">
+            { content }
+        </div>
+    }
+
+    return <AccessibleButton className="mx_SpaceRoomDirectory_roomTile" onClick={onPreviewClick}>
+        { content }
+    </AccessibleButton>;
+};
+
+export const showRoom = (room: ISpaceSummaryRoom, viaServers?: string[], autoJoin = false) => {
+    // Don't let the user view a room they won't be able to either peek or join:
+    // fail earlier so they don't have to click back to the directory.
+    if (MatrixClientPeg.get().isGuest()) {
+        if (!room.world_readable && !room.guest_can_join) {
+            dis.dispatch({ action: "require_registration" });
+            return;
+        }
+    }
+
+    const roomAlias = getDisplayAliasForRoom(room) || undefined;
+    dis.dispatch({
+        action: "view_room",
+        auto_join: autoJoin,
+        should_peek: true,
+        _type: "room_directory", // instrumentation
+        room_alias: roomAlias,
+        room_id: room.room_id,
+        via_servers: viaServers,
+        oob_data: {
+            avatarUrl: room.avatar_url,
+            // XXX: This logic is duplicated from the JS SDK which would normally decide what the name is.
+            name: room.name || roomAlias || _t("Unnamed room"),
+        },
+    });
+};
+
+interface IHierarchyLevelProps {
+    spaceId: string;
+    rooms: Map<string, ISpaceSummaryRoom>;
+    editing?: boolean;
+    relations: EnhancedMap<string, string[]>;
+    parents: Set<string>;
+    queueAction?(action: IAction): void;
+    onPreviewClick(roomId: string): void;
+    onRemoveFromSpaceClick?(roomId: string): void;
+    onJoinClick?(roomId: string): void;
+}
+
+export const HierarchyLevel = ({
+    spaceId,
+    rooms,
+    editing,
+    relations,
+    parents,
+    onPreviewClick,
+    onJoinClick,
+    queueAction,
+}: IHierarchyLevelProps) => {
+    const cli = MatrixClientPeg.get();
+    const space = cli.getRoom(spaceId);
+    // TODO respect order
+    const [subspaces, childRooms] = relations.get(spaceId)?.reduce((result, roomId: string) => {
+        if (!rooms.has(roomId)) return result; // TODO wat
+        result[rooms.get(roomId).room_type === RoomType.Space ? 0 : 1].push(roomId);
+        return result;
+    }, [[], []]) || [[], []];
+
+    // Don't render this subspace if it has no rooms we can show
+    // TODO this is broken - as a space may have subspaces we still need to show
+    // if (!childRooms.length) return null;
+
+    const userId = cli.getUserId();
+
+    const newParents = new Set(parents).add(spaceId);
+    return <React.Fragment>
+        {
+            childRooms.map(roomId => (
+                <RoomTile
+                    key={roomId}
+                    room={rooms.get(roomId)}
+                    event={space?.currentState.maySendStateEvent(EventType.SpaceChild, userId)
+                        ? space?.currentState.getStateEvents(EventType.SpaceChild, roomId)
+                        : undefined}
+                    editing={editing}
+                    queueAction={queueAction}
+                    onPreviewClick={() => {
+                        onPreviewClick(roomId);
+                    }}
+                    onJoinClick={onJoinClick ? () => {
+                        onJoinClick(roomId);
+                    } : undefined}
+                />
+            ))
+        }
+
+        {
+            subspaces.filter(roomId => !newParents.has(roomId)).map(roomId => (
+                <SubSpace
+                    key={roomId}
+                    space={rooms.get(roomId)}
+                    event={space?.currentState.getStateEvents(EventType.SpaceChild, roomId)}
+                    editing={editing}
+                    queueAction={queueAction}
+                    onPreviewClick={() => {
+                        onPreviewClick(roomId);
+                    }}
+                    onJoinClick={() => {
+                        onJoinClick(roomId);
+                    }}
+                >
+                    <HierarchyLevel
+                        spaceId={roomId}
+                        rooms={rooms}
+                        editing={editing}
+                        relations={relations}
+                        parents={newParents}
+                        onPreviewClick={onPreviewClick}
+                        onJoinClick={onJoinClick}
+                        queueAction={queueAction}
+                    />
+                </SubSpace>
+            ))
+        }
+    </React.Fragment>
+};
+
+const SpaceRoomDirectory: React.FC<IProps> = ({ space, initialText = "", onFinished }) => {
+    // TODO pagination
+    const cli = MatrixClientPeg.get();
+    const [query, setQuery] = useState(initialText);
+    const [isEditing, setIsEditing] = useState(false);
+
+    const onCreateRoomClick = () => {
+        dis.dispatch({
+            action: 'view_create_room',
+            public: true,
+        });
+        onFinished();
+    };
+
+    // stored within a ref as we don't need to re-render when it changes
+    const pendingActions = useRef(new Map<string, IAction>());
+
+    let adminButton;
+    if (shouldShowSpaceSettings(cli, space)) { // TODO this is an imperfect test
+        const onManageButtonClicked = () => {
+            setIsEditing(true);
+        };
+
+        const onSaveButtonClicked = () => {
+            // TODO setBusy
+            pendingActions.current.forEach(({event, autoJoin, removed}) => {
+                const content = {
+                    ...event.getContent(),
+                    auto_join: autoJoin,
+                };
+
+                if (removed) {
+                    delete content["via"];
+                }
+
+                cli.sendStateEvent(event.getRoomId(), event.getType(), content, event.getStateKey());
+            });
+            setIsEditing(false);
+        };
+
+        if (isEditing) {
+            adminButton = <React.Fragment>
+                <FormButton label={_t("Save changes")} onClick={onSaveButtonClicked} />
+                <span>{ _t("All users join by default") }</span>
+            </React.Fragment>;
+        } else {
+            adminButton = <FormButton label={_t("Manage rooms")} onClick={onManageButtonClicked} />;
+        }
+    }
+
+    const [rooms, relations, viaMap] = useAsyncMemo(async () => {
+        try {
+            const data = await cli.getSpaceSummary(space.roomId);
+
+            const parentChildRelations = new EnhancedMap<string, string[]>();
+            const viaMap = new EnhancedMap<string, Set<string>>();
+            data.events.map((ev: ISpaceSummaryEvent) => {
+                if (ev.type === EventType.SpaceChild) {
+                    parentChildRelations.getOrCreate(ev.room_id, []).push(ev.state_key);
+                }
+                if (Array.isArray(ev.content["via"])) {
+                    const set = viaMap.getOrCreate(ev.state_key, new Set());
+                    ev.content["via"].forEach(via => set.add(via));
+                }
+            });
+
+            return [data.rooms, parentChildRelations, viaMap];
+        } catch (e) {
+            console.error(e); // TODO
+        }
+
+        return [];
+    }, [space], []);
+
+    const roomsMap = useMemo(() => {
+        if (!rooms) return null;
+        const lcQuery = query.toLowerCase();
+
+        const filteredRooms = rooms.filter(r => {
+            return r.room_type === RoomType.Space // always include spaces to allow filtering of sub-space rooms
+                || r.name?.toLowerCase().includes(lcQuery)
+                || r.topic?.toLowerCase().includes(lcQuery);
+        });
+
+        return new Map<string, ISpaceSummaryRoom>(filteredRooms.map(r => [r.room_id, r]));
+        // const root = rooms.get(space.roomId);
+    }, [rooms, query]);
+
+    const title = <React.Fragment>
+        <RoomAvatar room={space} height={40} width={40} />
+        <div>
+            <h1>{ _t("Explore rooms") }</h1>
+            <div><RoomName room={space} /></div>
+        </div>
+    </React.Fragment>;
+    const explanation =
+        _t("If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.", null,
+            {a: sub => {
+                return <AccessibleButton kind="link" onClick={onCreateRoomClick}>{sub}</AccessibleButton>;
+            }},
+        );
+
+    let content;
+    if (roomsMap) {
+        content = <AutoHideScrollbar className="mx_SpaceRoomDirectory_list">
+            <HierarchyLevel
+                spaceId={space.roomId}
+                rooms={roomsMap}
+                editing={isEditing}
+                relations={relations}
+                parents={new Set()}
+                queueAction={action => {
+                    pendingActions.current.set(action.event.room_id, action);
+                }}
+                onPreviewClick={roomId => {
+                    showRoom(roomsMap.get(roomId), Array.from(viaMap.get(roomId) || []), false);
+                    onFinished();
+                }}
+                onJoinClick={(roomId) => {
+                    showRoom(roomsMap.get(roomId), Array.from(viaMap.get(roomId) || []), true);
+                    onFinished();
+                }}
+            />
+        </AutoHideScrollbar>;
+    }
+
+    // TODO loading state/error state
+    return (
+        <BaseDialog className="mx_SpaceRoomDirectory" hasCancel={true} onFinished={onFinished} title={title}>
+            <div className="mx_Dialog_content">
+                { explanation }
+
+                <SearchBox
+                    className="mx_textinput_icon mx_textinput_search"
+                    placeholder={ _t("Find a room...") }
+                    onSearch={setQuery}
+                />
+
+                <div className="mx_SpaceRoomDirectory_listHeader">
+                    { adminButton }
+                </div>
+                { content }
+            </div>
+        </BaseDialog>
+    );
+};
+
+export default SpaceRoomDirectory;
+
+// Similar to matrix-react-sdk's MatrixTools.getDisplayAliasForRoom
+// but works with the objects we get from the public room list
+function getDisplayAliasForRoom(room: ISpaceSummaryRoom) {
+    return room.canonical_alias || (room.aliases ? room.aliases[0] : "");
+}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index bb800b2af2..04a6d63272 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2577,6 +2577,16 @@
     "Failed to reject invite": "Failed to reject invite",
     "You have %(count)s unread notifications in a prior version of this room.|other": "You have %(count)s unread notifications in a prior version of this room.",
     "You have %(count)s unread notifications in a prior version of this room.|one": "You have %(count)s unread notification in a prior version of this room.",
+    "Unnamed Space": "Unnamed Space",
+    "Undo": "Undo",
+    "Remove from Space": "Remove from Space",
+    "No permissions": "No permissions",
+    "You're in this space": "You're in this space",
+    "You're in this room": "You're in this room",
+    "Save changes": "Save changes",
+    "All users join by default": "All users join by default",
+    "Manage rooms": "Manage rooms",
+    "Find a room...": "Find a room...",
     "Accept Invite": "Accept Invite",
     "Invite people": "Invite people",
     "Add existing rooms & spaces": "Add existing rooms & spaces",

From ca1bd78921e0fb05bbaaae185f3a29402b61a38e Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 2 Mar 2021 14:19:40 +0000
Subject: [PATCH 135/420] Add space specific variant of the dropdown on "Rooms
 +" sublist

---
 res/css/views/rooms/_RoomList.scss            |  5 +-
 .../element-icons/roomlist/hash-circle.svg    |  7 +++
 .../element-icons/roomlist/plus-circle.svg    |  3 ++
 src/components/views/rooms/RoomList.tsx       | 47 +++++++++++++++++++
 src/i18n/strings/en_EN.json                   |  4 ++
 5 files changed, 65 insertions(+), 1 deletion(-)
 create mode 100644 res/img/element-icons/roomlist/hash-circle.svg
 create mode 100644 res/img/element-icons/roomlist/plus-circle.svg

diff --git a/res/css/views/rooms/_RoomList.scss b/res/css/views/rooms/_RoomList.scss
index 66e1b827d0..d49ed4b736 100644
--- a/res/css/views/rooms/_RoomList.scss
+++ b/res/css/views/rooms/_RoomList.scss
@@ -19,7 +19,10 @@ limitations under the License.
 }
 
 .mx_RoomList_iconPlus::before {
-    mask-image: url('$(res)/img/element-icons/roomlist/plus.svg');
+    mask-image: url('$(res)/img/element-icons/roomlist/plus-circle.svg');
+}
+.mx_RoomList_iconHash::before {
+    mask-image: url('$(res)/img/element-icons/roomlist/hash-circle.svg');
 }
 .mx_RoomList_iconExplore::before {
     mask-image: url('$(res)/img/element-icons/roomlist/explore.svg');
diff --git a/res/img/element-icons/roomlist/hash-circle.svg b/res/img/element-icons/roomlist/hash-circle.svg
new file mode 100644
index 0000000000..924b22cf32
--- /dev/null
+++ b/res/img/element-icons/roomlist/hash-circle.svg
@@ -0,0 +1,7 @@
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <mask id="path-1-inside-1" fill="white">
+        <path fill-rule="evenodd" clip-rule="evenodd" d="M9 17C13.4183 17 17 13.4183 17 9C17 4.58172 13.4183 1 9 1C4.58172 1 1 4.58172 1 9C1 13.4183 4.58172 17 9 17ZM8.33969 5.15616C8.38275 4.74419 8.0837 4.37532 7.67173 4.33225C7.25976 4.28918 6.89088 4.58824 6.84781 5.00021L6.68776 6.53131H5.65625C5.24204 6.53131 4.90625 6.8671 4.90625 7.28131C4.90625 7.69552 5.24204 8.03131 5.65625 8.03131H6.53095L6.32841 9.96881H5.39062C4.97641 9.96881 4.64062 10.3046 4.64062 10.7188C4.64062 11.133 4.97641 11.4688 5.39062 11.4688H6.17161L6.01969 12.9221C5.97662 13.3341 6.27568 13.7029 6.68765 13.746C7.09962 13.7891 7.46849 13.49 7.51156 13.078L7.67978 11.4688H9.49973L9.34781 12.9221C9.30475 13.3341 9.6038 13.7029 10.0158 13.746C10.4277 13.7891 10.7966 13.49 10.8397 13.078L11.0079 11.4688H12.2969C12.7111 11.4688 13.0469 11.133 13.0469 10.7188C13.0469 10.3046 12.7111 9.96881 12.2969 9.96881H11.1647L11.3673 8.03131H12.2969C12.7111 8.03131 13.0469 7.69552 13.0469 7.28131C13.0469 6.8671 12.7111 6.53131 12.2969 6.53131H11.5241L11.6678 5.15616C11.7109 4.74419 11.4118 4.37532 10.9999 4.33225C10.5879 4.28918 10.219 4.58824 10.1759 5.00021L10.0159 6.53131H8.19593L8.33969 5.15616ZM9.65654 9.96881H7.83659L8.03913 8.03131H9.85908L9.65654 9.96881Z"/>
+    </mask>
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M9 17C13.4183 17 17 13.4183 17 9C17 4.58172 13.4183 1 9 1C4.58172 1 1 4.58172 1 9C1 13.4183 4.58172 17 9 17ZM8.33969 5.15616C8.38275 4.74419 8.0837 4.37532 7.67173 4.33225C7.25976 4.28918 6.89088 4.58824 6.84781 5.00021L6.68776 6.53131H5.65625C5.24204 6.53131 4.90625 6.8671 4.90625 7.28131C4.90625 7.69552 5.24204 8.03131 5.65625 8.03131H6.53095L6.32841 9.96881H5.39062C4.97641 9.96881 4.64062 10.3046 4.64062 10.7188C4.64062 11.133 4.97641 11.4688 5.39062 11.4688H6.17161L6.01969 12.9221C5.97662 13.3341 6.27568 13.7029 6.68765 13.746C7.09962 13.7891 7.46849 13.49 7.51156 13.078L7.67978 11.4688H9.49973L9.34781 12.9221C9.30475 13.3341 9.6038 13.7029 10.0158 13.746C10.4277 13.7891 10.7966 13.49 10.8397 13.078L11.0079 11.4688H12.2969C12.7111 11.4688 13.0469 11.133 13.0469 10.7188C13.0469 10.3046 12.7111 9.96881 12.2969 9.96881H11.1647L11.3673 8.03131H12.2969C12.7111 8.03131 13.0469 7.69552 13.0469 7.28131C13.0469 6.8671 12.7111 6.53131 12.2969 6.53131H11.5241L11.6678 5.15616C11.7109 4.74419 11.4118 4.37532 10.9999 4.33225C10.5879 4.28918 10.219 4.58824 10.1759 5.00021L10.0159 6.53131H8.19593L8.33969 5.15616ZM9.65654 9.96881H7.83659L8.03913 8.03131H9.85908L9.65654 9.96881Z" fill="black"/>
+    <path d="M7.67173 4.33225L7.5331 5.65836H7.5331L7.67173 4.33225ZM8.33969 5.15616L9.66579 5.29479V5.29479L8.33969 5.15616ZM6.84781 5.00021L5.52171 4.86158L5.52171 4.86158L6.84781 5.00021ZM6.68776 6.53131V7.86464H7.88898L8.01387 6.66994L6.68776 6.53131ZM6.53095 8.03131L7.85706 8.16994L8.01093 6.69798H6.53095V8.03131ZM6.32841 9.96881V11.3021H7.52963L7.65452 10.1074L6.32841 9.96881ZM6.17161 11.4688L7.49772 11.6074L7.65159 10.1355H6.17161V11.4688ZM6.01969 12.9221L4.69358 12.7835V12.7835L6.01969 12.9221ZM6.68765 13.746L6.82628 12.4199H6.82627L6.68765 13.746ZM7.51156 13.078L8.83767 13.2167L8.83767 13.2167L7.51156 13.078ZM7.67978 11.4688V10.1355H6.47857L6.35368 11.3302L7.67978 11.4688ZM9.49973 11.4688L10.8258 11.6074L10.9797 10.1355H9.49973V11.4688ZM9.34781 12.9221L10.6739 13.0607V13.0607L9.34781 12.9221ZM10.0158 13.746L10.1544 12.4199H10.1544L10.0158 13.746ZM10.8397 13.078L12.1658 13.2167V13.2167L10.8397 13.078ZM11.0079 11.4688V10.1355H9.80669L9.6818 11.3302L11.0079 11.4688ZM11.1647 9.96881L9.83861 9.83018L9.68473 11.3021H11.1647V9.96881ZM11.3673 8.03131V6.69798H10.166L10.0411 7.89268L11.3673 8.03131ZM11.5241 6.53131L10.198 6.39268L10.0441 7.86464H11.5241V6.53131ZM11.6678 5.15616L10.3417 5.01754V5.01754L11.6678 5.15616ZM10.9999 4.33225L11.1385 3.00614H11.1385L10.9999 4.33225ZM10.1759 5.00021L8.84983 4.86158L8.84983 4.86158L10.1759 5.00021ZM10.0159 6.53131V7.86464H11.2171L11.342 6.66994L10.0159 6.53131ZM8.19593 6.53131L6.86982 6.39268L6.71595 7.86464H8.19593V6.53131ZM7.83659 9.96881L6.51048 9.83018L6.35661 11.3021H7.83659V9.96881ZM9.65654 9.96881V11.3021H10.8578L10.9826 10.1074L9.65654 9.96881ZM8.03913 8.03131V6.69798H6.83791L6.71302 7.89268L8.03913 8.03131ZM9.85908 8.03131L11.1852 8.16994L11.3391 6.69798H9.85908V8.03131ZM15.6667 9C15.6667 12.6819 12.6819 15.6667 9 15.6667V18.3333C14.1547 18.3333 18.3333 14.1547 18.3333 9H15.6667ZM9 2.33333C12.6819 2.33333 15.6667 5.3181 15.6667 9H18.3333C18.3333 3.84534 14.1547 -0.333333 9 -0.333333V2.33333ZM2.33333 9C2.33333 5.3181 5.3181 2.33333 9 2.33333V-0.333333C3.84534 -0.333333 -0.333333 3.84534 -0.333333 9H2.33333ZM9 15.6667C5.3181 15.6667 2.33333 12.6819 2.33333 9H-0.333333C-0.333333 14.1547 3.84534 18.3333 9 18.3333V15.6667ZM7.5331 5.65836C7.21268 5.62486 6.98008 5.33796 7.01358 5.01754L9.66579 5.29479C9.78542 4.15043 8.95471 3.12577 7.81035 3.00614L7.5331 5.65836ZM8.17392 5.13884C8.14043 5.45925 7.85352 5.69185 7.5331 5.65836L7.81035 3.00614C6.666 2.88652 5.64134 3.71722 5.52171 4.86158L8.17392 5.13884ZM8.01387 6.66994L8.17392 5.13883L5.52171 4.86158L5.36165 6.39268L8.01387 6.66994ZM5.65625 7.86464H6.68776V5.19798H5.65625V7.86464ZM6.23958 7.28131C6.23958 7.60348 5.97842 7.86464 5.65625 7.86464V5.19798C4.50566 5.19798 3.57292 6.13072 3.57292 7.28131H6.23958ZM5.65625 6.69798C5.97842 6.69798 6.23958 6.95914 6.23958 7.28131H3.57292C3.57292 8.4319 4.50566 9.36464 5.65625 9.36464V6.69798ZM6.53095 6.69798H5.65625V9.36464H6.53095V6.69798ZM7.65452 10.1074L7.85706 8.16994L5.20485 7.89268L5.00231 9.83018L7.65452 10.1074ZM5.39062 11.3021H6.32841V8.63548H5.39062V11.3021ZM5.97396 10.7188C5.97396 11.041 5.71279 11.3021 5.39062 11.3021V8.63548C4.24003 8.63548 3.30729 9.56822 3.30729 10.7188H5.97396ZM5.39062 10.1355C5.71279 10.1355 5.97396 10.3966 5.97396 10.7188H3.30729C3.30729 11.8694 4.24003 12.8021 5.39062 12.8021V10.1355ZM6.17161 10.1355H5.39062V12.8021H6.17161V10.1355ZM7.3458 13.0607L7.49772 11.6074L4.8455 11.3302L4.69358 12.7835L7.3458 13.0607ZM6.82627 12.4199C7.14669 12.4534 7.37929 12.7403 7.3458 13.0607L4.69358 12.7835C4.57396 13.9278 5.40466 14.9525 6.54902 15.0721L6.82627 12.4199ZM6.18545 12.9394C6.21895 12.619 6.50585 12.3864 6.82628 12.4199L6.54902 15.0721C7.69338 15.1917 8.71804 14.361 8.83767 13.2167L6.18545 12.9394ZM6.35368 11.3302L6.18545 12.9394L8.83767 13.2167L9.00589 11.6074L6.35368 11.3302ZM9.49973 10.1355H7.67978V12.8021H9.49973V10.1355ZM10.6739 13.0607L10.8258 11.6074L8.17363 11.3302L8.02171 12.7835L10.6739 13.0607ZM10.1544 12.4199C10.4748 12.4534 10.7074 12.7403 10.6739 13.0607L8.02171 12.7835C7.90208 13.9278 8.73279 14.9525 9.87715 15.0721L10.1544 12.4199ZM9.51358 12.9394C9.54707 12.619 9.83398 12.3864 10.1544 12.4199L9.87714 15.0721C11.0215 15.1917 12.0462 14.361 12.1658 13.2167L9.51358 12.9394ZM9.6818 11.3302L9.51358 12.9394L12.1658 13.2167L12.334 11.6074L9.6818 11.3302ZM12.2969 10.1355H11.0079V12.8021H12.2969V10.1355ZM11.7135 10.7188C11.7135 10.3966 11.9747 10.1355 12.2969 10.1355V12.8021C13.4475 12.8021 14.3802 11.8694 14.3802 10.7188H11.7135ZM12.2969 11.3021C11.9747 11.3021 11.7135 11.041 11.7135 10.7188H14.3802C14.3802 9.56822 13.4475 8.63548 12.2969 8.63548V11.3021ZM11.1647 11.3021H12.2969V8.63548H11.1647V11.3021ZM10.0411 7.89268L9.83861 9.83018L12.4908 10.1074L12.6934 8.16994L10.0411 7.89268ZM12.2969 6.69798H11.3673V9.36464H12.2969V6.69798ZM11.7135 7.28131C11.7135 6.95914 11.9747 6.69798 12.2969 6.69798V9.36464C13.4475 9.36464 14.3802 8.4319 14.3802 7.28131H11.7135ZM12.2969 7.86464C11.9747 7.86464 11.7135 7.60348 11.7135 7.28131H14.3802C14.3802 6.13072 13.4475 5.19798 12.2969 5.19798V7.86464ZM11.5241 7.86464H12.2969V5.19798H11.5241V7.86464ZM10.3417 5.01754L10.198 6.39268L12.8502 6.66994L12.9939 5.29479L10.3417 5.01754ZM10.8612 5.65836C10.5408 5.62486 10.3082 5.33796 10.3417 5.01754L12.9939 5.29479C13.1135 4.15043 12.2828 3.12577 11.1385 3.00614L10.8612 5.65836ZM11.502 5.13884C11.4686 5.45925 11.1816 5.69185 10.8612 5.65836L11.1385 3.00614C9.99412 2.88652 8.96946 3.71722 8.84983 4.86158L11.502 5.13884ZM11.342 6.66994L11.502 5.13883L8.84983 4.86158L8.68978 6.39268L11.342 6.66994ZM8.19593 7.86464H10.0159V5.19798H8.19593V7.86464ZM7.01358 5.01754L6.86982 6.39268L9.52204 6.66994L9.66579 5.29479L7.01358 5.01754ZM7.83659 11.3021H9.65654V8.63548H7.83659V11.3021ZM6.71302 7.89268L6.51048 9.83018L9.16269 10.1074L9.36523 8.16994L6.71302 7.89268ZM9.85908 6.69798H8.03913V9.36464H9.85908V6.69798ZM10.9826 10.1074L11.1852 8.16994L8.53297 7.89268L8.33043 9.83018L10.9826 10.1074Z" fill="black" mask="url(#path-1-inside-1)"/>
+</svg>
diff --git a/res/img/element-icons/roomlist/plus-circle.svg b/res/img/element-icons/roomlist/plus-circle.svg
new file mode 100644
index 0000000000..251ded225c
--- /dev/null
+++ b/res/img/element-icons/roomlist/plus-circle.svg
@@ -0,0 +1,3 @@
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17 9C17 13.4183 13.4183 17 9 17C4.58172 17 1 13.4183 1 9C1 4.58172 4.58172 1 9 1C13.4183 1 17 4.58172 17 9ZM5.25 9C5.25 8.58579 5.58579 8.25 6 8.25H8.25V6C8.25 5.58579 8.58579 5.25 9 5.25C9.41421 5.25 9.75 5.58579 9.75 6V8.25H12C12.4142 8.25 12.75 8.58579 12.75 9C12.75 9.41421 12.4142 9.75 12 9.75H9.75V12C9.75 12.4142 9.41421 12.75 9 12.75C8.58579 12.75 8.25 12.4142 8.25 12V9.75H6C5.58579 9.75 5.25 9.41421 5.25 9Z" fill="black"/>
+</svg>
diff --git a/src/components/views/rooms/RoomList.tsx b/src/components/views/rooms/RoomList.tsx
index 45db15df7c..f7da6571da 100644
--- a/src/components/views/rooms/RoomList.tsx
+++ b/src/components/views/rooms/RoomList.tsx
@@ -47,6 +47,9 @@ import { IconizedContextMenuOption, IconizedContextMenuOptionList } from "../con
 import AccessibleButton from "../elements/AccessibleButton";
 import { CommunityPrototypeStore } from "../../../stores/CommunityPrototypeStore";
 import CallHandler from "../../../CallHandler";
+import SpaceStore from "../../../stores/SpaceStore";
+import { showAddExistingRooms, showCreateNewRoom } from "../../../utils/space";
+import { EventType } from "matrix-js-sdk/src/@types/event";
 
 interface IProps {
     onKeyDown: (ev: React.KeyboardEvent) => void;
@@ -152,6 +155,50 @@ const TAG_AESTHETICS: ITagAestheticsMap = {
         defaultHidden: false,
         addRoomLabel: _td("Add room"),
         addRoomContextMenu: (onFinished: () => void) => {
+            if (SpaceStore.instance.activeSpace) {
+                const canAddRooms = SpaceStore.instance.activeSpace.currentState.maySendStateEvent(EventType.SpaceChild,
+                    MatrixClientPeg.get().getUserId());
+
+                return <IconizedContextMenuOptionList first>
+                    <IconizedContextMenuOption
+                        label={_t("Create new room")}
+                        iconClassName="mx_RoomList_iconPlus"
+                        onClick={(e) => {
+                            e.preventDefault();
+                            e.stopPropagation();
+                            onFinished();
+                            showCreateNewRoom(MatrixClientPeg.get(), SpaceStore.instance.activeSpace);
+                        }}
+                        disabled={!canAddRooms}
+                        tooltip={canAddRooms ? undefined
+                            : _t("You do not have permissions to create new rooms in this space")}
+                    />
+                    <IconizedContextMenuOption
+                        label={_t("Add existing room")}
+                        iconClassName="mx_RoomList_iconHash"
+                        onClick={(e) => {
+                            e.preventDefault();
+                            e.stopPropagation();
+                            onFinished();
+                            showAddExistingRooms(MatrixClientPeg.get(), SpaceStore.instance.activeSpace);
+                        }}
+                        disabled={!canAddRooms}
+                        tooltip={canAddRooms ? undefined
+                            : _t("You do not have permissions to add rooms to this space")}
+                    />
+                    <IconizedContextMenuOption
+                        label={_t("Explore space rooms")}
+                        iconClassName="mx_RoomList_iconExplore"
+                        onClick={(e) => {
+                            e.preventDefault();
+                            e.stopPropagation();
+                            onFinished();
+                            defaultDispatcher.fire(Action.ViewRoomDirectory);
+                        }}
+                    />
+                </IconizedContextMenuOptionList>;
+            }
+
             return <IconizedContextMenuOptionList first>
                 <IconizedContextMenuOption
                     label={_t("Create new room")}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 04a6d63272..6d2f41ceae 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1509,6 +1509,10 @@
     "Rooms": "Rooms",
     "Add room": "Add room",
     "Create new room": "Create new room",
+    "You do not have permissions to create new rooms in this space": "You do not have permissions to create new rooms in this space",
+    "Add existing room": "Add existing room",
+    "You do not have permissions to add rooms to this space": "You do not have permissions to add rooms to this space",
+    "Explore space rooms": "Explore space rooms",
     "Explore community rooms": "Explore community rooms",
     "Explore public rooms": "Explore public rooms",
     "Low priority": "Low priority",

From 716268b2f953e54345389d08c2a95825e7590a7a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 2 Mar 2021 14:34:47 +0000
Subject: [PATCH 136/420] Add context menu to spaces in the space panel

---
 res/css/structures/_SpacePanel.scss           |  75 ++++++
 src/accessibility/context_menu/MenuItem.tsx   |  11 +-
 src/components/views/dialogs/InfoDialog.js    |   6 +-
 .../views/spaces/SpaceTreeLevel.tsx           | 216 ++++++++++++++++++
 src/i18n/strings/en_EN.json                   |  16 +-
 5 files changed, 314 insertions(+), 10 deletions(-)

diff --git a/res/css/structures/_SpacePanel.scss b/res/css/structures/_SpacePanel.scss
index 24d2243912..9937117086 100644
--- a/res/css/structures/_SpacePanel.scss
+++ b/res/css/structures/_SpacePanel.scss
@@ -212,6 +212,30 @@ $activeBorderColor: $secondary-fg-color;
                 border-radius: 8px;
             }
         }
+
+        .mx_SpaceButton_menuButton {
+            width: 20px;
+            min-width: 20px; // yay flex
+            height: 20px;
+            margin-top: auto;
+            margin-bottom: auto;
+            position: relative;
+            display: none;
+
+            &::before {
+                top: 2px;
+                left: 2px;
+                content: '';
+                width: 16px;
+                height: 16px;
+                position: absolute;
+                mask-position: center;
+                mask-size: contain;
+                mask-repeat: no-repeat;
+                mask-image: url('$(res)/img/element-icons/context-menu.svg');
+                background: $primary-fg-color;
+            }
+        }
     }
 
     .mx_SpacePanel_badgeContainer {
@@ -254,6 +278,10 @@ $activeBorderColor: $secondary-fg-color;
                 height: 0;
                 display: none;
             }
+
+            .mx_SpaceButton_menuButton {
+                display: block;
+            }
         }
     }
 
@@ -272,3 +300,50 @@ $activeBorderColor: $secondary-fg-color;
         }
     }
 }
+
+.mx_SpacePanel_contextMenu {
+    .mx_SpacePanel_contextMenu_header {
+        margin: 12px 16px 12px;
+        font-weight: $font-semi-bold;
+        font-size: $font-15px;
+        line-height: $font-18px;
+    }
+
+    .mx_IconizedContextMenu_optionList .mx_AccessibleButton.mx_SpacePanel_contextMenu_inviteButton {
+        color: $accent-color;
+
+        .mx_SpacePanel_iconInvite::before {
+            background-color: $accent-color;
+            mask-image: url('$(res)/img/element-icons/room/invite.svg');
+        }
+    }
+
+    .mx_SpacePanel_iconSettings::before {
+        mask-image: url('$(res)/img/element-icons/settings.svg');
+    }
+
+    .mx_SpacePanel_iconLeave::before {
+        mask-image: url('$(res)/img/element-icons/leave.svg');
+    }
+
+    .mx_SpacePanel_iconHome::before {
+        mask-image: url('$(res)/img/element-icons/roomlist/home.svg');
+    }
+
+    .mx_SpacePanel_iconMembers::before {
+        mask-image: url('$(res)/img/element-icons/room/members.svg');
+    }
+
+    .mx_SpacePanel_iconPlus::before {
+        mask-image: url('$(res)/img/element-icons/plus.svg');
+    }
+
+    .mx_SpacePanel_iconExplore::before {
+        mask-image: url('$(res)/img/element-icons/roomlist/explore.svg');
+    }
+}
+
+
+.mx_SpacePanel_sharePublicSpace {
+    margin: 0;
+}
diff --git a/src/accessibility/context_menu/MenuItem.tsx b/src/accessibility/context_menu/MenuItem.tsx
index 0bb169abf8..9a7c1d1f0a 100644
--- a/src/accessibility/context_menu/MenuItem.tsx
+++ b/src/accessibility/context_menu/MenuItem.tsx
@@ -19,14 +19,23 @@ limitations under the License.
 import React from "react";
 
 import AccessibleButton from "../../components/views/elements/AccessibleButton";
+import AccessibleTooltipButton from "../../components/views/elements/AccessibleTooltipButton";
 
 interface IProps extends React.ComponentProps<typeof AccessibleButton> {
     label?: string;
+    tooltip?: string;
 }
 
 // Semantic component for representing a role=menuitem
-export const MenuItem: React.FC<IProps> = ({children, label, ...props}) => {
+export const MenuItem: React.FC<IProps> = ({children, label, tooltip, ...props}) => {
     const ariaLabel = props["aria-label"] || label;
+
+    if (tooltip) {
+        return <AccessibleTooltipButton {...props} role="menuitem" tabIndex={-1} aria-label={ariaLabel} title={tooltip}>
+            { children }
+        </AccessibleTooltipButton>;
+    }
+
     return (
         <AccessibleButton {...props} role="menuitem" tabIndex={-1} aria-label={ariaLabel}>
             { children }
diff --git a/src/components/views/dialogs/InfoDialog.js b/src/components/views/dialogs/InfoDialog.js
index 97ae968ff3..6dc9fc01b0 100644
--- a/src/components/views/dialogs/InfoDialog.js
+++ b/src/components/views/dialogs/InfoDialog.js
@@ -27,7 +27,7 @@ export default class InfoDialog extends React.Component {
         className: PropTypes.string,
         title: PropTypes.string,
         description: PropTypes.node,
-        button: PropTypes.string,
+        button: PropTypes.oneOfType(PropTypes.string, PropTypes.bool),
         onFinished: PropTypes.func,
         hasCloseButton: PropTypes.bool,
         onKeyDown: PropTypes.func,
@@ -60,11 +60,11 @@ export default class InfoDialog extends React.Component {
                 <div className={classNames("mx_Dialog_content", this.props.className)} id="mx_Dialog_content">
                     { this.props.description }
                 </div>
-                <DialogButtons primaryButton={this.props.button || _t('OK')}
+                { this.props.button !== false && <DialogButtons primaryButton={this.props.button || _t('OK')}
                     onPrimaryButtonClick={this.onFinished}
                     hasCancel={false}
                 >
-                </DialogButtons>
+                </DialogButtons> }
             </BaseDialog>
         );
     }
diff --git a/src/components/views/spaces/SpaceTreeLevel.tsx b/src/components/views/spaces/SpaceTreeLevel.tsx
index f94798433f..04d6c02208 100644
--- a/src/components/views/spaces/SpaceTreeLevel.tsx
+++ b/src/components/views/spaces/SpaceTreeLevel.tsx
@@ -23,7 +23,27 @@ import SpaceStore from "../../../stores/SpaceStore";
 import NotificationBadge from "../rooms/NotificationBadge";
 import {RovingAccessibleButton} from "../../../accessibility/roving/RovingAccessibleButton";
 import {RovingAccessibleTooltipButton} from "../../../accessibility/roving/RovingAccessibleTooltipButton";
+import IconizedContextMenu, {
+    IconizedContextMenuOption,
+    IconizedContextMenuOptionList,
+} from "../context_menus/IconizedContextMenu";
+import {_t} from "../../../languageHandler";
+import {ContextMenuTooltipButton} from "../../../accessibility/context_menu/ContextMenuTooltipButton";
+import {toRightOf} from "../../structures/ContextMenu";
+import {shouldShowSpaceSettings, showCreateNewRoom, showSpaceSettings} from "../../../utils/space";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import {ButtonEvent} from "../elements/AccessibleButton";
+import defaultDispatcher from "../../../dispatcher/dispatcher";
+import Modal from "../../../Modal";
+import SpacePublicShare from "./SpacePublicShare";
+import {Action} from "../../../dispatcher/actions";
+import RoomViewStore from "../../../stores/RoomViewStore";
+import {SetRightPanelPhasePayload} from "../../../dispatcher/payloads/SetRightPanelPhasePayload";
+import {RightPanelPhases} from "../../../stores/RightPanelStorePhases";
+import {showRoomInviteDialog} from "../../../RoomInvite";
+import InfoDialog from "../dialogs/InfoDialog";
+import {EventType} from "matrix-js-sdk/src/@types/event";
+import SpaceRoomDirectory from "../../structures/SpaceRoomDirectory";
 
 interface IItemProps {
     space?: Room;
@@ -78,6 +98,200 @@ export class SpaceItem extends React.PureComponent<IItemProps, IItemState> {
         SpaceStore.instance.setActiveSpace(this.props.space);
     };
 
+    private onMenuOpenClick = (ev: React.MouseEvent) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+        const target = ev.target as HTMLButtonElement;
+        this.setState({contextMenuPosition: target.getBoundingClientRect()});
+    };
+
+    private onMenuClose = () => {
+        this.setState({contextMenuPosition: null});
+    };
+
+    private onHomeClick = (ev: ButtonEvent) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+
+        defaultDispatcher.dispatch({
+            action: "view_room",
+            room_id: this.props.space.roomId,
+        });
+        this.setState({contextMenuPosition: null}); // also close the menu
+    };
+
+    private onInviteClick = (ev: ButtonEvent) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+
+        if (this.props.space.getJoinRule() === "public") {
+            const modal = Modal.createTrackedDialog("Space Invite", "User Menu", InfoDialog, {
+                title: _t("Invite members"),
+                description: <React.Fragment>
+                    <span>{ _t("Share your public space") }</span>
+                    <SpacePublicShare space={this.props.space} onFinished={() => modal.close()} />
+                </React.Fragment>,
+                fixedWidth: false,
+                button: false,
+                className: "mx_SpacePanel_sharePublicSpace",
+                hasCloseButton: true,
+            });
+        } else {
+            showRoomInviteDialog(this.props.space.roomId);
+        }
+        this.setState({contextMenuPosition: null}); // also close the menu
+    };
+
+    private onSettingsClick = (ev: ButtonEvent) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+
+        showSpaceSettings(this.context, this.props.space);
+        this.setState({contextMenuPosition: null}); // also close the menu
+    };
+
+    private onLeaveClick = (ev: ButtonEvent) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+
+        defaultDispatcher.dispatch({
+            action: "leave_room",
+            room_id: this.props.space.roomId,
+        });
+        this.setState({contextMenuPosition: null}); // also close the menu
+    };
+
+    private onNewRoomClick = (ev: ButtonEvent) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+
+        showCreateNewRoom(this.context, this.props.space);
+        this.setState({contextMenuPosition: null}); // also close the menu
+    };
+
+    private onMembersClick = (ev: ButtonEvent) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+
+        if (!RoomViewStore.getRoomId()) {
+            defaultDispatcher.dispatch({
+                action: "view_room",
+                room_id: this.props.space.roomId,
+            }, true);
+        }
+
+        defaultDispatcher.dispatch<SetRightPanelPhasePayload>({
+            action: Action.SetRightPanelPhase,
+            phase: RightPanelPhases.SpaceMemberList,
+            refireParams: { space: this.props.space },
+        });
+        this.setState({contextMenuPosition: null}); // also close the menu
+    };
+
+    private onExploreRoomsClick = (ev: ButtonEvent) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+
+        Modal.createTrackedDialog("Space room directory", "Space panel", SpaceRoomDirectory, {
+            space: this.props.space,
+        }, "mx_SpaceRoomDirectory_dialogWrapper", false, true);
+        this.setState({contextMenuPosition: null}); // also close the menu
+    };
+
+    private renderContextMenu(): React.ReactElement {
+        let contextMenu = null;
+        if (this.state.contextMenuPosition) {
+            const userId = this.context.getUserId();
+
+            let inviteOption;
+            if (this.props.space.canInvite(userId)) {
+                inviteOption = (
+                    <IconizedContextMenuOption
+                        className="mx_SpacePanel_contextMenu_inviteButton"
+                        iconClassName="mx_SpacePanel_iconInvite"
+                        label={_t("Invite people")}
+                        onClick={this.onInviteClick}
+                    />
+                );
+            }
+
+            let settingsOption;
+            let leaveSection;
+            if (shouldShowSpaceSettings(this.context, this.props.space)) {
+                settingsOption = (
+                    <IconizedContextMenuOption
+                        iconClassName="mx_SpacePanel_iconSettings"
+                        label={_t("Settings")}
+                        onClick={this.onSettingsClick}
+                    />
+                );
+            } else {
+                leaveSection = <IconizedContextMenuOptionList red first>
+                    <IconizedContextMenuOption
+                        iconClassName="mx_SpacePanel_iconLeave"
+                        label={_t("Leave space")}
+                        onClick={this.onLeaveClick}
+                    />
+                </IconizedContextMenuOptionList>;
+            }
+
+            let newRoomOption;
+            if (this.props.space.currentState.maySendStateEvent(EventType.SpaceChild, userId)) {
+                newRoomOption = (
+                    <IconizedContextMenuOption
+                        iconClassName="mx_SpacePanel_iconPlus"
+                        label={_t("New room")}
+                        onClick={this.onNewRoomClick}
+                    />
+                );
+            }
+
+            contextMenu = <IconizedContextMenu
+                {...toRightOf(this.state.contextMenuPosition, 0)}
+                onFinished={this.onMenuClose}
+                className="mx_SpacePanel_contextMenu"
+                compact
+            >
+                <div className="mx_SpacePanel_contextMenu_header">
+                    { this.props.space.name }
+                </div>
+                <IconizedContextMenuOptionList first>
+                    { inviteOption }
+                    <IconizedContextMenuOption
+                        iconClassName="mx_SpacePanel_iconHome"
+                        label={_t("Space Home")}
+                        onClick={this.onHomeClick}
+                    />
+                    <IconizedContextMenuOption
+                        iconClassName="mx_SpacePanel_iconMembers"
+                        label={_t("Members")}
+                        onClick={this.onMembersClick}
+                    />
+                    { settingsOption }
+                    <IconizedContextMenuOption
+                        iconClassName="mx_SpacePanel_iconExplore"
+                        label={_t("Explore rooms")}
+                        onClick={this.onExploreRoomsClick}
+                    />
+                    { newRoomOption }
+                </IconizedContextMenuOptionList>
+                { leaveSection }
+            </IconizedContextMenu>;
+        }
+
+        return (
+            <React.Fragment>
+                <ContextMenuTooltipButton
+                    className="mx_SpaceButton_menuButton"
+                    onClick={this.onMenuOpenClick}
+                    title={_t("Space options")}
+                    isExpanded={!!this.state.contextMenuPosition}
+                />
+                { contextMenu }
+            </React.Fragment>
+        );
+    }
+
     render() {
         const {space, activeSpaces, isNested} = this.props;
 
@@ -133,6 +347,7 @@ export class SpaceItem extends React.PureComponent<IItemProps, IItemState> {
                     <div className="mx_SpaceButton_selectionWrapper">
                         <RoomAvatar width={avatarSize} height={avatarSize} room={space} />
                         { notifBadge }
+                        { this.renderContextMenu() }
                     </div>
                 </RovingAccessibleTooltipButton>
             );
@@ -149,6 +364,7 @@ export class SpaceItem extends React.PureComponent<IItemProps, IItemState> {
                         <RoomAvatar width={avatarSize} height={avatarSize} room={space} />
                         <span className="mx_SpaceButton_name">{ space.name }</span>
                         { notifBadge }
+                        { this.renderContextMenu() }
                     </div>
                 </RovingAccessibleButton>
             );
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 6d2f41ceae..19324e1540 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1003,6 +1003,16 @@
     "Failed to copy": "Failed to copy",
     "Share invite link": "Share invite link",
     "Invite by email or username": "Invite by email or username",
+    "Invite members": "Invite members",
+    "Share your public space": "Share your public space",
+    "Invite people": "Invite people",
+    "Settings": "Settings",
+    "Leave space": "Leave space",
+    "New room": "New room",
+    "Space Home": "Space Home",
+    "Members": "Members",
+    "Explore rooms": "Explore rooms",
+    "Space options": "Space options",
     "Remove": "Remove",
     "This bridge was provisioned by <user />.": "This bridge was provisioned by <user />.",
     "This bridge is managed by <user />.": "This bridge is managed by <user />.",
@@ -1583,7 +1593,6 @@
     "Favourited": "Favourited",
     "Favourite": "Favourite",
     "Low Priority": "Low Priority",
-    "Settings": "Settings",
     "Leave Room": "Leave Room",
     "Room options": "Room options",
     "%(count)s unread messages including mentions.|other": "%(count)s unread messages including mentions.",
@@ -1672,7 +1681,6 @@
     "The homeserver the user you’re verifying is connected to": "The homeserver the user you’re verifying is connected to",
     "Yours, or the other users’ internet connection": "Yours, or the other users’ internet connection",
     "Yours, or the other users’ session": "Yours, or the other users’ session",
-    "Members": "Members",
     "Room Info": "Room Info",
     "You can only pin up to %(count)s widgets|other": "You can only pin up to %(count)s widgets",
     "Unpin": "Unpin",
@@ -2510,13 +2518,11 @@
     "Explore Public Rooms": "Explore Public Rooms",
     "Create a Group Chat": "Create a Group Chat",
     "Upgrade to %(hostSignupBrand)s": "Upgrade to %(hostSignupBrand)s",
-    "Explore rooms": "Explore rooms",
     "Failed to reject invitation": "Failed to reject invitation",
     "Cannot create rooms in this community": "Cannot create rooms in this community",
     "You do not have permission to create rooms in this community.": "You do not have permission to create rooms in this community.",
     "This space is not public. You will not be able to rejoin without an invite.": "This space is not public. You will not be able to rejoin without an invite.",
     "This room is not public. You will not be able to rejoin without an invite.": "This room is not public. You will not be able to rejoin without an invite.",
-    "Leave space": "Leave space",
     "Are you sure you want to leave the space '%(spaceName)s'?": "Are you sure you want to leave the space '%(spaceName)s'?",
     "Are you sure you want to leave the room '%(roomName)s'?": "Are you sure you want to leave the room '%(roomName)s'?",
     "Failed to forget room %(errCode)s": "Failed to forget room %(errCode)s",
@@ -2592,7 +2598,6 @@
     "Manage rooms": "Manage rooms",
     "Find a room...": "Find a room...",
     "Accept Invite": "Accept Invite",
-    "Invite people": "Invite people",
     "Add existing rooms & spaces": "Add existing rooms & spaces",
     "%(count)s members|other": "%(count)s members",
     "%(count)s members|one": "%(count)s member",
@@ -2607,7 +2612,6 @@
     "Failed to create initial space rooms": "Failed to create initial space rooms",
     "Skip for now": "Skip for now",
     "Creating rooms...": "Creating rooms...",
-    "Share your public space": "Share your public space",
     "At the moment only you can see it.": "At the moment only you can see it.",
     "Finish": "Finish",
     "Who are you working with?": "Who are you working with?",

From 43cc7deedae82893a96f22493a0e360399f12968 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 2 Mar 2021 14:37:28 +0000
Subject: [PATCH 137/420] Show hierarchy of auto_join rooms in the space view

---
 res/css/structures/_SpaceRoomView.scss      |  8 +++
 src/components/structures/SpaceRoomView.tsx | 59 ++++++++++++++++++++-
 src/i18n/strings/en_EN.json                 |  2 +
 3 files changed, 67 insertions(+), 2 deletions(-)

diff --git a/res/css/structures/_SpaceRoomView.scss b/res/css/structures/_SpaceRoomView.scss
index ee60389c59..38310d39a9 100644
--- a/res/css/structures/_SpaceRoomView.scss
+++ b/res/css/structures/_SpaceRoomView.scss
@@ -219,6 +219,14 @@ $SpaceRoomViewInnerWidth: 428px;
                 }
             }
         }
+
+        .mx_SpaceRoomDirectory_list {
+            max-width: 600px;
+
+            .mx_SpaceRoomDirectory_roomTile_actions {
+                display: none;
+            }
+        }
     }
 
     .mx_SpaceRoomView_privateScope {
diff --git a/src/components/structures/SpaceRoomView.tsx b/src/components/structures/SpaceRoomView.tsx
index f1a8a4d71b..5c91efc1c0 100644
--- a/src/components/structures/SpaceRoomView.tsx
+++ b/src/components/structures/SpaceRoomView.tsx
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import React, {RefObject, useContext, useRef, useState} from "react";
-import {EventType} from "matrix-js-sdk/src/@types/event";
+import {EventType, RoomType} from "matrix-js-sdk/src/@types/event";
 import {Room} from "matrix-js-sdk/src/models/room";
 
 import MatrixClientContext from "../../contexts/MatrixClientContext";
@@ -24,6 +24,7 @@ import {_t} from "../../languageHandler";
 import AccessibleButton from "../views/elements/AccessibleButton";
 import RoomName from "../views/elements/RoomName";
 import RoomTopic from "../views/elements/RoomTopic";
+import InlineSpinner from "../views/elements/InlineSpinner";
 import FormButton from "../views/elements/FormButton";
 import {inviteMultipleToRoom, showRoomInviteDialog} from "../../RoomInvite";
 import {useRoomMembers} from "../../hooks/useRoomMembers";
@@ -47,7 +48,12 @@ import {SetRightPanelPhasePayload} from "../../dispatcher/payloads/SetRightPanel
 import {useStateArray} from "../../hooks/useStateArray";
 import SpacePublicShare from "../views/spaces/SpacePublicShare";
 import {showAddExistingRooms, showCreateNewRoom, shouldShowSpaceSettings, showSpaceSettings} from "../../utils/space";
+import {HierarchyLevel, ISpaceSummaryEvent, ISpaceSummaryRoom, showRoom} from "./SpaceRoomDirectory";
+import {useAsyncMemo} from "../../hooks/useAsyncMemo";
+import {EnhancedMap} from "../../utils/maps";
+import AutoHideScrollbar from "./AutoHideScrollbar";
 import MemberAvatar from "../views/avatars/MemberAvatar";
+import {useStateToggle} from "../../hooks/useStateToggle";
 
 interface IProps {
     space: Room;
@@ -121,13 +127,15 @@ const SpaceLanding = ({ space, onJoinButtonClicked, onRejectButtonClicked }) =>
 
     const canAddRooms = myMembership === "join" && space.currentState.maySendStateEvent(EventType.SpaceChild, userId);
 
+    const [_, forceUpdate] = useStateToggle(false); // TODO
+
     let addRoomButtons;
     if (canAddRooms) {
         addRoomButtons = <React.Fragment>
             <AccessibleButton className="mx_SpaceRoomView_landing_addButton" onClick={async () => {
                 const [added] = await showAddExistingRooms(cli, space);
                 if (added) {
-                    // TODO update rooms shown once we show hierarchy here
+                    forceUpdate();
                 }
             }}>
                 { _t("Add existing rooms & spaces") }
@@ -149,6 +157,51 @@ const SpaceLanding = ({ space, onJoinButtonClicked, onRejectButtonClicked }) =>
         </AccessibleButton>;
     }
 
+    const [loading, roomsMap, relations, numRooms] = useAsyncMemo(async () => {
+        try {
+            const data = await cli.getSpaceSummary(space.roomId, undefined, myMembership !== "join");
+
+            const parentChildRelations = new EnhancedMap<string, string[]>();
+            data.events.map((ev: ISpaceSummaryEvent) => {
+                if (ev.type === EventType.SpaceChild) {
+                    parentChildRelations.getOrCreate(ev.room_id, []).push(ev.state_key);
+                }
+            });
+
+            const roomsMap = new Map<string, ISpaceSummaryRoom>(data.rooms.map(r => [r.room_id, r]));
+            const numRooms = data.rooms.filter(r => r.room_type !== RoomType.Space).length;
+            return [false, roomsMap, parentChildRelations, numRooms];
+        } catch (e) {
+            console.error(e); // TODO
+        }
+
+        return [false];
+    }, [space, _], [true]);
+
+    let previewRooms;
+    if (roomsMap) {
+        previewRooms = <AutoHideScrollbar className="mx_SpaceRoomDirectory_list">
+            <div className="mx_SpaceRoomDirectory_roomCount">
+                <h3>{ myMembership === "join" ? _t("Rooms") : _t("Default Rooms")}</h3>
+                <span>{ numRooms }</span>
+            </div>
+            <HierarchyLevel
+                spaceId={space.roomId}
+                rooms={roomsMap}
+                editing={false}
+                relations={relations}
+                parents={new Set()}
+                onPreviewClick={roomId => {
+                    showRoom(roomsMap.get(roomId), [], false); // TODO
+                }}
+            />
+        </AutoHideScrollbar>;
+    } else if (loading) {
+        previewRooms = <InlineSpinner />;
+    } else {
+        previewRooms = <p>{_t("Your server does not support showing space hierarchies.")}</p>;
+    }
+
     return <div className="mx_SpaceRoomView_landing">
         <RoomAvatar room={space} height={80} width={80} viewAvatarOnClick={true} />
         <div className="mx_SpaceRoomView_landing_name">
@@ -213,6 +266,8 @@ const SpaceLanding = ({ space, onJoinButtonClicked, onRejectButtonClicked }) =>
             { addRoomButtons }
             { settingsButton }
         </div>
+
+        { previewRooms }
     </div>;
 };
 
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 19324e1540..8609af6a71 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2599,6 +2599,8 @@
     "Find a room...": "Find a room...",
     "Accept Invite": "Accept Invite",
     "Add existing rooms & spaces": "Add existing rooms & spaces",
+    "Default Rooms": "Default Rooms",
+    "Your server does not support showing space hierarchies.": "Your server does not support showing space hierarchies.",
     "%(count)s members|other": "%(count)s members",
     "%(count)s members|one": "%(count)s member",
     "<inviter/> invited you to <name/>": "<inviter/> invited you to <name/>",

From 20e57d15fd2d77e9dc783ef55480a963a5329054 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 2 Mar 2021 15:20:54 +0000
Subject: [PATCH 138/420] Option for audio streaming

---
 .../views/context_menus/WidgetContextMenu.tsx       | 13 +++++++++++++
 src/i18n/strings/en_EN.json                         |  1 +
 src/stores/widgets/ElementWidgetActions.ts          |  1 +
 3 files changed, 15 insertions(+)

diff --git a/src/components/views/context_menus/WidgetContextMenu.tsx b/src/components/views/context_menus/WidgetContextMenu.tsx
index c1af86eae6..e7d1c02c66 100644
--- a/src/components/views/context_menus/WidgetContextMenu.tsx
+++ b/src/components/views/context_menus/WidgetContextMenu.tsx
@@ -31,6 +31,7 @@ import QuestionDialog from "../dialogs/QuestionDialog";
 import {WidgetType} from "../../../widgets/WidgetType";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import { Container, WidgetLayoutStore } from "../../../stores/widgets/WidgetLayoutStore";
+import { getConfigLivestreamUrl, startJitsiAudioLivestream } from "../../../Livestream";
 
 interface IProps extends React.ComponentProps<typeof IconizedContextMenu> {
     app: IApp;
@@ -54,6 +55,17 @@ const WidgetContextMenu: React.FC<IProps> = ({
     const widgetMessaging = WidgetMessagingStore.instance.getMessagingForId(app.id);
     const canModify = userWidget || WidgetUtils.canUserModifyWidgets(roomId);
 
+    let streamAudioStreamButton;
+    if (getConfigLivestreamUrl() && (app.type === "m.jitsi" || app.type === "jitsi")) {
+        const onStreamAudioClick = () => {
+            startJitsiAudioLivestream(widgetMessaging, roomId);
+            onFinished();
+        };
+        streamAudioStreamButton = <IconizedContextMenuOption
+            onClick={onStreamAudioClick} label={_t("Start audio stream")}
+        />;
+    }
+
     let unpinButton;
     if (showUnpin) {
         const onUnpinClick = () => {
@@ -163,6 +175,7 @@ const WidgetContextMenu: React.FC<IProps> = ({
 
     return <IconizedContextMenu {...props} chevronFace={ChevronFace.None} onFinished={onFinished}>
         <IconizedContextMenuOptionList>
+            { streamAudioStreamButton }
             { editButton }
             { revokeButton }
             { deleteButton }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 38460a5f6e..7242ed7de6 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2357,6 +2357,7 @@
     "Set status": "Set status",
     "Set a new status...": "Set a new status...",
     "View Community": "View Community",
+    "Start audio stream": "Start audio stream",
     "Take a picture": "Take a picture",
     "Delete Widget": "Delete Widget",
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?",
diff --git a/src/stores/widgets/ElementWidgetActions.ts b/src/stores/widgets/ElementWidgetActions.ts
index de48746a74..cd591a6fb4 100644
--- a/src/stores/widgets/ElementWidgetActions.ts
+++ b/src/stores/widgets/ElementWidgetActions.ts
@@ -19,6 +19,7 @@ import { IWidgetApiRequest } from "matrix-widget-api";
 export enum ElementWidgetActions {
     ClientReady = "im.vector.ready",
     HangupCall = "im.vector.hangup",
+    StartLiveStream = "im.vector.start_live_stream",
     OpenIntegrationManager = "integration_manager_open",
 
     /**

From d1a75885a7a65477ab106e65b745a6e2e972daf6 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 2 Mar 2021 15:35:02 +0000
Subject: [PATCH 139/420] Protect onAction dispatch handler on the SpaceStore
 with Spaces disabled

---
 src/stores/SpaceStore.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/stores/SpaceStore.tsx b/src/stores/SpaceStore.tsx
index d675879138..8e0066da91 100644
--- a/src/stores/SpaceStore.tsx
+++ b/src/stores/SpaceStore.tsx
@@ -408,6 +408,7 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
     }
 
     protected async onAction(payload: ActionPayload) {
+        if (!SettingsStore.getValue("feature_spaces")) return;
         switch (payload.action) {
             case "view_room": {
                 const room = this.matrixClient?.getRoom(payload.room_id);

From 867ce322e1da4675b78bb884256bbcef423f585e Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 2 Mar 2021 10:47:49 -0700
Subject: [PATCH 140/420] Add .tmp files to gitignore

My git client is convinced that `src/component-index.js.tmp` needs to be checked in, which is nice of it but also wrong.
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 33e8bfc7ac..e1dd7726e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ package-lock.json
 /src/component-index.js
 
 .DS_Store
+*.tmp

From 08d35073de93367b059b23c1581b8eb765822754 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 2 Mar 2021 11:04:12 -0700
Subject: [PATCH 141/420] Improve commentary

---
 src/components/views/messages/EditHistoryMessage.js | 2 +-
 src/components/views/rooms/EventTile.js             | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/views/messages/EditHistoryMessage.js b/src/components/views/messages/EditHistoryMessage.js
index 6c420a16fc..0967be937a 100644
--- a/src/components/views/messages/EditHistoryMessage.js
+++ b/src/components/views/messages/EditHistoryMessage.js
@@ -158,7 +158,7 @@ export default class EditHistoryMessage extends React.PureComponent {
         const isSending = (['sending', 'queued', 'encrypting'].indexOf(this.state.sendStatus) !== -1);
         const classes = classNames({
             "mx_EventTile": true,
-            // Note: we keep these sending state classes for tests, not for our styles
+            // Note: we keep the `sending` state class for tests, not for our styles
             "mx_EventTile_sending": isSending,
             "mx_EventTile_notSent": this.state.sendStatus === 'not_sent',
         });
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 01e932dd3a..b4192fc8d3 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -408,6 +408,8 @@ export default class EventTile extends React.Component {
             return;
         }
 
+        // We force update because we have no state or prop changes to queue up, instead relying on
+        // the getters we use here to determine what needs rendering.
         this.forceUpdate(() => {
             // Per elsewhere in this file, we can remove the listener once we will have no further purpose for it.
             if (!this._shouldShowSentReceipt && !this._shouldShowSendingReceipt) {
@@ -805,8 +807,7 @@ export default class EventTile extends React.Component {
             mx_EventTile_isEditing: isEditing,
             mx_EventTile_info: isInfoMessage,
             mx_EventTile_12hr: this.props.isTwelveHour,
-            // Note: we keep these sending state classes for tests, not for our styles
-            mx_EventTile_encrypting: this.props.eventSendStatus === 'encrypting',
+            // Note: we keep the `sending` state class for tests, not for our styles
             mx_EventTile_sending: !isEditing && isSending,
             mx_EventTile_notSent: this.props.eventSendStatus === 'not_sent',
             mx_EventTile_highlight: this.props.tileShape === 'notif' ? false : this.shouldHighlight(),

From d9a801910a44a80c63035fcaab5769450951c612 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 3 Mar 2021 11:34:29 +0000
Subject: [PATCH 142/420] Tweak spaces copy

---
 src/RoomInvite.js                             |  7 ++---
 src/components/structures/SpaceRoomView.tsx   |  2 +-
 src/components/views/dialogs/InviteDialog.tsx | 31 +++++++++++--------
 .../views/spaces/SpaceCreateMenu.tsx          | 11 +++----
 src/i18n/strings/en_EN.json                   | 18 ++++++-----
 5 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/src/RoomInvite.js b/src/RoomInvite.js
index 503411d2b3..9ae41b851a 100644
--- a/src/RoomInvite.js
+++ b/src/RoomInvite.js
@@ -22,7 +22,7 @@ import MultiInviter from './utils/MultiInviter';
 import Modal from './Modal';
 import * as sdk from './';
 import { _t } from './languageHandler';
-import InviteDialog, {KIND_DM, KIND_INVITE, KIND_SPACE_INVITE} from "./components/views/dialogs/InviteDialog";
+import InviteDialog, {KIND_DM, KIND_INVITE} from "./components/views/dialogs/InviteDialog";
 import CommunityPrototypeInviteDialog from "./components/views/dialogs/CommunityPrototypeInviteDialog";
 import {CommunityPrototypeStore} from "./stores/CommunityPrototypeStore";
 
@@ -50,11 +50,10 @@ export function showStartChatInviteDialog(initialText) {
 }
 
 export function showRoomInviteDialog(roomId) {
-    const isSpace = MatrixClientPeg.get()?.getRoom(roomId)?.isSpaceRoom();
     // This dialog handles the room creation internally - we don't need to worry about it.
     Modal.createTrackedDialog(
-        "Invite Users", isSpace ? "Space" : "Room", InviteDialog, {
-            kind: isSpace ? KIND_SPACE_INVITE : KIND_INVITE,
+        "Invite Users", "", InviteDialog, {
+            kind: KIND_INVITE,
             roomId,
         },
         /*className=*/null, /*isPriority=*/false, /*isStatic=*/true,
diff --git a/src/components/structures/SpaceRoomView.tsx b/src/components/structures/SpaceRoomView.tsx
index 5c91efc1c0..9bacdd975d 100644
--- a/src/components/structures/SpaceRoomView.tsx
+++ b/src/components/structures/SpaceRoomView.tsx
@@ -557,7 +557,7 @@ export default class SpaceRoomView extends React.PureComponent<IProps, IState> {
             case Phase.PublicCreateRooms:
                 return <SpaceSetupFirstRooms
                     space={this.props.space}
-                    title={_t("What discussions do you want to have?")}
+                    title={_t("What are some things you want to discuss?")}
                     description={_t("We'll create rooms for each topic.")}
                     onFinished={() => this.setState({ phase: Phase.PublicShare })}
                 />;
diff --git a/src/components/views/dialogs/InviteDialog.tsx b/src/components/views/dialogs/InviteDialog.tsx
index 9bc5b6476f..6d5cb8786e 100644
--- a/src/components/views/dialogs/InviteDialog.tsx
+++ b/src/components/views/dialogs/InviteDialog.tsx
@@ -48,7 +48,6 @@ import { MatrixCall } from 'matrix-js-sdk/src/webrtc/call';
 
 export const KIND_DM = "dm";
 export const KIND_INVITE = "invite";
-export const KIND_SPACE_INVITE = "space_invite";
 export const KIND_CALL_TRANSFER = "call_transfer";
 
 const INITIAL_ROOMS_SHOWN = 3; // Number of rooms to show at first
@@ -310,7 +309,7 @@ interface IInviteDialogProps {
     // not provided.
     kind: string,
 
-    // The room ID this dialog is for. Only required for KIND_INVITE and KIND_SPACE_INVITE.
+    // The room ID this dialog is for. Only required for KIND_INVITE.
     roomId: string,
 
     // The call to transfer. Only required for KIND_CALL_TRANSFER.
@@ -349,8 +348,8 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
     constructor(props) {
         super(props);
 
-        if ((props.kind === KIND_INVITE || props.kind === KIND_SPACE_INVITE) && !props.roomId) {
-            throw new Error("When using KIND_INVITE or KIND_SPACE_INVITE a roomId is required for an InviteDialog");
+        if ((props.kind === KIND_INVITE) && !props.roomId) {
+            throw new Error("When using KIND_INVITE a roomId is required for an InviteDialog");
         } else if (props.kind === KIND_CALL_TRANSFER && !props.call) {
             throw new Error("When using KIND_CALL_TRANSFER a call is required for an InviteDialog");
         }
@@ -1027,7 +1026,7 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
             sectionSubname = _t("May include members not in %(communityName)s", {communityName});
         }
 
-        if (this.props.kind === KIND_INVITE || this.props.kind === KIND_SPACE_INVITE) {
+        if (this.props.kind === KIND_INVITE) {
             sectionName = kind === 'recents' ? _t("Recently Direct Messaged") : _t("Suggestions");
         }
 
@@ -1248,25 +1247,31 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
             }
             buttonText = _t("Go");
             goButtonFn = this._startDm;
-        } else if (this.props.kind === KIND_INVITE || this.props.kind === KIND_SPACE_INVITE) {
-            title = this.props.kind === KIND_INVITE ? _t("Invite to this room") : _t("Invite to this space");
+        } else if (this.props.kind === KIND_INVITE) {
+            const room = MatrixClientPeg.get()?.getRoom(this.props.roomId);
+            const isSpace = room?.isSpaceRoom();
+            title = isSpace
+                ? _t("Invite to %(spaceName)s", {
+                    spaceName: room.name || _t("Unnamed Space"),
+                })
+                : _t("Invite to this room");
 
             let helpTextUntranslated;
-            if (this.props.kind === KIND_INVITE) {
+            if (isSpace) {
                 if (identityServersEnabled) {
                     helpTextUntranslated = _td("Invite someone using their name, email address, username " +
-                        "(like <userId/>) or <a>share this room</a>.");
+                        "(like <userId/>) or <a>share this space</a>.");
                 } else {
                     helpTextUntranslated = _td("Invite someone using their name, username " +
-                        "(like <userId/>) or <a>share this room</a>.");
+                        "(like <userId/>) or <a>share this space</a>.");
                 }
-            } else { // KIND_SPACE_INVITE
+            } else {
                 if (identityServersEnabled) {
                     helpTextUntranslated = _td("Invite someone using their name, email address, username " +
-                        "(like <userId/>) or <a>share this space</a>.");
+                        "(like <userId/>) or <a>share this room</a>.");
                 } else {
                     helpTextUntranslated = _td("Invite someone using their name, username " +
-                        "(like <userId/>) or <a>share this space</a>.");
+                        "(like <userId/>) or <a>share this room</a>.");
                 }
             }
 
diff --git a/src/components/views/spaces/SpaceCreateMenu.tsx b/src/components/views/spaces/SpaceCreateMenu.tsx
index 9d0543a6c5..88098d1b66 100644
--- a/src/components/views/spaces/SpaceCreateMenu.tsx
+++ b/src/components/views/spaces/SpaceCreateMenu.tsx
@@ -107,7 +107,8 @@ const SpaceCreateMenu = ({ onFinished }) => {
     if (visibility === null) {
         body = <React.Fragment>
             <h2>{ _t("Create a space") }</h2>
-            <p>{ _t("Organise rooms into spaces, for just you or anyone") }</p>
+            <p>{ _t("Spaces are new ways to group rooms and people. " +
+                "To join an existing space you’ll need an invite") }</p>
 
             <SpaceCreateMenuType
                 title={_t("Public")}
@@ -117,12 +118,12 @@ const SpaceCreateMenu = ({ onFinished }) => {
             />
             <SpaceCreateMenuType
                 title={_t("Private")}
-                description={_t("Invite only space, best for yourself or teams")}
+                description={_t("Invite only, best for yourself or teams")}
                 className="mx_SpaceCreateMenuType_private"
                 onClick={() => setVisibility(Visibility.Private)}
             />
 
-            {/*<p>{ _t("Looking to join an existing space?") }</p>*/}
+            <p>{ _t("You can change this later") }</p>
         </React.Fragment>;
     } else {
         body = <React.Fragment>
@@ -134,9 +135,7 @@ const SpaceCreateMenu = ({ onFinished }) => {
 
             <h2>
                 {
-                    visibility === Visibility.Public
-                        ? _t("Personalise your public space")
-                        : _t("Personalise your private space")
+                    visibility === Visibility.Public ? _t("Your public space") : _t("Your private space")
                 }
             </h2>
             <p>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 8609af6a71..e256e6bb2f 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -983,14 +983,15 @@
     "Name": "Name",
     "Description": "Description",
     "Create a space": "Create a space",
-    "Organise rooms into spaces, for just you or anyone": "Organise rooms into spaces, for just you or anyone",
+    "Spaces are new ways to group rooms and people. To join an existing space you’ll need an invite": "Spaces are new ways to group rooms and people. To join an existing space you’ll need an invite",
     "Public": "Public",
     "Open space for anyone, best for communities": "Open space for anyone, best for communities",
     "Private": "Private",
-    "Invite only space, best for yourself or teams": "Invite only space, best for yourself or teams",
+    "Invite only, best for yourself or teams": "Invite only, best for yourself or teams",
+    "You can change this later": "You can change this later",
     "Go back": "Go back",
-    "Personalise your public space": "Personalise your public space",
-    "Personalise your private space": "Personalise your private space",
+    "Your public space": "Your public space",
+    "Your private space": "Your private space",
     "Give it a photo, name and description to help you identify it.": "Give it a photo, name and description to help you identify it.",
     "You can change these at any point.": "You can change these at any point.",
     "Creating...": "Creating...",
@@ -2190,10 +2191,12 @@
     "Start a conversation with someone using their name or username (like <userId/>).": "Start a conversation with someone using their name or username (like <userId/>).",
     "This won't invite them to %(communityName)s. To invite someone to %(communityName)s, click <a>here</a>": "This won't invite them to %(communityName)s. To invite someone to %(communityName)s, click <a>here</a>",
     "Go": "Go",
-    "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.": "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.",
-    "Invite someone using their name, username (like <userId/>) or <a>share this room</a>.": "Invite someone using their name, username (like <userId/>) or <a>share this room</a>.",
+    "Invite to %(spaceName)s": "Invite to %(spaceName)s",
+    "Unnamed Space": "Unnamed Space",
     "Invite someone using their name, email address, username (like <userId/>) or <a>share this space</a>.": "Invite someone using their name, email address, username (like <userId/>) or <a>share this space</a>.",
     "Invite someone using their name, username (like <userId/>) or <a>share this space</a>.": "Invite someone using their name, username (like <userId/>) or <a>share this space</a>.",
+    "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.": "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.",
+    "Invite someone using their name, username (like <userId/>) or <a>share this room</a>.": "Invite someone using their name, username (like <userId/>) or <a>share this room</a>.",
     "Transfer": "Transfer",
     "a new master key signature": "a new master key signature",
     "a new cross-signing key signature": "a new cross-signing key signature",
@@ -2587,7 +2590,6 @@
     "Failed to reject invite": "Failed to reject invite",
     "You have %(count)s unread notifications in a prior version of this room.|other": "You have %(count)s unread notifications in a prior version of this room.",
     "You have %(count)s unread notifications in a prior version of this room.|one": "You have %(count)s unread notification in a prior version of this room.",
-    "Unnamed Space": "Unnamed Space",
     "Undo": "Undo",
     "Remove from Space": "Remove from Space",
     "No permissions": "No permissions",
@@ -2626,7 +2628,7 @@
     "Invite your teammates": "Invite your teammates",
     "Invite by username": "Invite by username",
     "Inviting...": "Inviting...",
-    "What discussions do you want to have?": "What discussions do you want to have?",
+    "What are some things you want to discuss?": "What are some things you want to discuss?",
     "We'll create rooms for each topic.": "We'll create rooms for each topic.",
     "What projects are you working on?": "What projects are you working on?",
     "We'll create rooms for each of them. You can add existing rooms after setup.": "We'll create rooms for each of them. You can add existing rooms after setup.",

From 85985db441da38bf3872f6483d15758af49f1b15 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 3 Mar 2021 11:50:41 +0000
Subject: [PATCH 143/420] add comment

---
 res/css/views/rooms/_MemberList.scss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/res/css/views/rooms/_MemberList.scss b/res/css/views/rooms/_MemberList.scss
index 631ddc484f..075e9ff585 100644
--- a/res/css/views/rooms/_MemberList.scss
+++ b/res/css/views/rooms/_MemberList.scss
@@ -46,6 +46,8 @@ limitations under the License.
     }
 
     .mx_RightPanel_scopeHeader {
+        // vertically align with position on other right panel cards
+        // to prevent it bouncing as user navigates right panel
         margin-top: -8px;
     }
 }

From 73411fa53dd9b8a2f3b9300779ee1bfe45c8c0f9 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 3 Mar 2021 13:42:44 +0000
Subject: [PATCH 144/420] tidy code style

---
 src/components/structures/SpaceRoomDirectory.tsx | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/components/structures/SpaceRoomDirectory.tsx b/src/components/structures/SpaceRoomDirectory.tsx
index 7f7b9dbb99..06df6a528e 100644
--- a/src/components/structures/SpaceRoomDirectory.tsx
+++ b/src/components/structures/SpaceRoomDirectory.tsx
@@ -157,10 +157,12 @@ const SubSpace: React.FC<ISubspaceProps> = ({
 
     let url: string;
     if (space.avatar_url) {
-        url = MatrixClientPeg.get().mxcUrlToHttp(space.avatar_url,
+        url = MatrixClientPeg.get().mxcUrlToHttp(
+            space.avatar_url,
             Math.floor(24 * window.devicePixelRatio),
             Math.floor(24 * window.devicePixelRatio),
-            "crop");
+            "crop",
+        );
     }
 
     return <div className="mx_SpaceRoomDirectory_subspace">
@@ -262,10 +264,12 @@ const RoomTile = ({ room, event, editing, queueAction, onPreviewClick, onJoinCli
 
     let url: string;
     if (room.avatar_url) {
-        url = cli.mxcUrlToHttp(room.avatar_url,
+        url = cli.mxcUrlToHttp(
+            room.avatar_url,
             Math.floor(32 * window.devicePixelRatio),
             Math.floor(32 * window.devicePixelRatio),
-            "crop");
+            "crop",
+        );
     }
 
     const content = <React.Fragment>

From d8483ddf0de4a08074a3c59ed0eff71da1390e74 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 3 Mar 2021 20:23:21 +0000
Subject: [PATCH 145/420] Don't place another call if there's already one
 ongoing

The 'call' button doesn't turn into a hangup button as soon as there's
a call in the room, but we should have been doing this anyway.
---
 src/CallHandler.tsx         | 8 ++++++++
 src/i18n/strings/en_EN.json | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/src/CallHandler.tsx b/src/CallHandler.tsx
index 42a38c7a54..8621f441de 100644
--- a/src/CallHandler.tsx
+++ b/src/CallHandler.tsx
@@ -706,6 +706,14 @@ export default class CallHandler {
                         return;
                     }
 
+                    if (this.getCallForRoom(room.roomId)) {
+                        Modal.createTrackedDialog('Call Handler', 'Existing Call with user', ErrorDialog, {
+                            title: _t('Already in call'),
+                            description: _t("You're already in a call with this person."),
+                        });
+                        return;
+                    }
+
                     const members = room.getJoinedMembers();
                     if (members.length <= 1) {
                         Modal.createTrackedDialog('Call Handler', 'Cannot place call with self', ErrorDialog, {
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index fa7f446b7c..a1999acb3b 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -58,6 +58,8 @@
     "You cannot place VoIP calls in this browser.": "You cannot place VoIP calls in this browser.",
     "Too Many Calls": "Too Many Calls",
     "You've reached the maximum number of simultaneous calls.": "You've reached the maximum number of simultaneous calls.",
+    "Already in call": "Already in call",
+    "You're already in a call with this person.": "You're already in a call with this person.",
     "You cannot place a call with yourself.": "You cannot place a call with yourself.",
     "Call in Progress": "Call in Progress",
     "A call is currently being placed!": "A call is currently being placed!",

From ae08f74336d3aa24988f7f3dba7d817cd5c96741 Mon Sep 17 00:00:00 2001
From: Panagiotis <27917356+panoschal@users.noreply.github.com>
Date: Wed, 3 Mar 2021 22:38:30 +0200
Subject: [PATCH 146/420] feat: improve "view source"

display encrypted and decrypted event source on the same dialog
keep only one "View Source" action on event context menu
---
 res/css/structures/_ViewSource.scss           | 11 ++++++-
 src/components/structures/ViewSource.js       | 32 ++++++++++++++-----
 .../views/context_menus/MessageContextMenu.js | 12 ++-----
 .../views/dialogs/RoomSettingsDialog.js       |  2 +-
 .../views/dialogs/UserSettingsDialog.js       |  2 +-
 src/i18n/strings/en_EN.json                   |  4 ++-
 src/i18n/strings/en_US.json                   |  4 ++-
 7 files changed, 44 insertions(+), 23 deletions(-)

diff --git a/res/css/structures/_ViewSource.scss b/res/css/structures/_ViewSource.scss
index 421d1f03cd..0cb5dd8f3a 100644
--- a/res/css/structures/_ViewSource.scss
+++ b/res/css/structures/_ViewSource.scss
@@ -22,9 +22,18 @@ limitations under the License.
     float: right;
 }
 
-.mx_ViewSource_label_bottom {
+.mx_ViewSource_separator {
     clear: both;
     border-bottom: 1px solid #e5e5e5;
+    padding-top: 0.7em;
+    padding-bottom: 0.7em;
+}
+
+.mx_ViewSource_heading {
+    font-size: $font-17px;
+    font-weight: 400;
+    color: $primary-fg-color;
+    margin-top: 0.7em;
 }
 
 .mx_ViewSource pre {
diff --git a/src/components/structures/ViewSource.js b/src/components/structures/ViewSource.js
index 0b969784e5..866f2e0a0b 100644
--- a/src/components/structures/ViewSource.js
+++ b/src/components/structures/ViewSource.js
@@ -19,7 +19,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import SyntaxHighlight from '../views/elements/SyntaxHighlight';
-import {_t} from "../../languageHandler";
+import {_t, _td} from "../../languageHandler";
 import * as sdk from "../../index";
 
 
@@ -29,20 +29,36 @@ export default class ViewSource extends React.Component {
         onFinished: PropTypes.func.isRequired,
         roomId: PropTypes.string.isRequired,
         eventId: PropTypes.string.isRequired,
+        isEncrypted: PropTypes.bool.isRequired,
+        decryptedContent: PropTypes.object,
     };
 
     render() {
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
+
+        const DecryptedSection = <>
+            <div className="mx_ViewSource_separator" />
+            <div className="mx_ViewSource_heading">{_t("Decrypted event source")}</div>
+            <SyntaxHighlight className="json">
+                { JSON.stringify(this.props.decryptedContent, null, 2) }
+            </SyntaxHighlight>
+        </>;
+
+        const OriginalSection = <>
+            <div className="mx_ViewSource_separator" />
+            <div className="mx_ViewSource_heading">{_t("Original event source")}</div>
+            <SyntaxHighlight className="json">
+                { JSON.stringify(this.props.content, null, 2) }
+            </SyntaxHighlight>
+        </>;
+
         return (
             <BaseDialog className="mx_ViewSource" onFinished={this.props.onFinished} title={_t('View Source')}>
-                <div className="mx_ViewSource_label_left">Room ID: { this.props.roomId }</div>
-                <div className="mx_ViewSource_label_right">Event ID: { this.props.eventId }</div>
-                <div className="mx_ViewSource_label_bottom" />
-
                 <div className="mx_Dialog_content">
-                    <SyntaxHighlight className="json">
-                        { JSON.stringify(this.props.content, null, 2) }
-                    </SyntaxHighlight>
+                    <div className="mx_ViewSource_label_left">Room ID: { this.props.roomId }</div>
+                    <div className="mx_ViewSource_label_left">Event ID: { this.props.eventId }</div>
+                    { this.props.isEncrypted && DecryptedSection }
+                    { OriginalSection }
                 </div>
             </BaseDialog>
         );
diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js
index 6b871e4f24..b002d1ec62 100644
--- a/src/components/views/context_menus/MessageContextMenu.js
+++ b/src/components/views/context_menus/MessageContextMenu.js
@@ -130,6 +130,8 @@ export default class MessageContextMenu extends React.Component {
             roomId: ev.getRoomId(),
             eventId: ev.getId(),
             content: ev.event,
+            isEncrypted: this.props.mxEvent.getType() !== this.props.mxEvent.getWireType(),
+            decryptedContent: ev._clearEvent,
         }, 'mx_Dialog_viewsource');
         this.closeMenu();
     };
@@ -309,7 +311,6 @@ export default class MessageContextMenu extends React.Component {
         let cancelButton;
         let forwardButton;
         let pinButton;
-        let viewClearSourceButton;
         let unhidePreviewButton;
         let externalURLButton;
         let quoteButton;
@@ -389,14 +390,6 @@ export default class MessageContextMenu extends React.Component {
             </MenuItem>
         );
 
-        if (mxEvent.getType() !== mxEvent.getWireType()) {
-            viewClearSourceButton = (
-                <MenuItem className="mx_MessageContextMenu_field" onClick={this.onViewClearSourceClick}>
-                    { _t('View Decrypted Source') }
-                </MenuItem>
-            );
-        }
-
         if (this.props.eventTileOps) {
             if (this.props.eventTileOps.isWidgetHidden()) {
                 unhidePreviewButton = (
@@ -481,7 +474,6 @@ export default class MessageContextMenu extends React.Component {
                 { forwardButton }
                 { pinButton }
                 { viewSourceButton }
-                { viewClearSourceButton }
                 { unhidePreviewButton }
                 { permalinkButton }
                 { quoteButton }
diff --git a/src/components/views/dialogs/RoomSettingsDialog.js b/src/components/views/dialogs/RoomSettingsDialog.js
index 9d9313f08f..368f2aeccd 100644
--- a/src/components/views/dialogs/RoomSettingsDialog.js
+++ b/src/components/views/dialogs/RoomSettingsDialog.js
@@ -116,7 +116,7 @@ export default class RoomSettingsDialog extends React.Component {
         return (
             <BaseDialog className='mx_RoomSettingsDialog' hasCancel={true}
                         onFinished={this.props.onFinished} title={_t("Room Settings - %(roomName)s", {roomName})}>
-                <div className='ms_SettingsDialog_content'>
+                <div className='mx_SettingsDialog_content'>
                     <TabbedView tabs={this._getTabs()} />
                 </div>
             </BaseDialog>
diff --git a/src/components/views/dialogs/UserSettingsDialog.js b/src/components/views/dialogs/UserSettingsDialog.js
index 7164540aea..3291fa2387 100644
--- a/src/components/views/dialogs/UserSettingsDialog.js
+++ b/src/components/views/dialogs/UserSettingsDialog.js
@@ -155,7 +155,7 @@ export default class UserSettingsDialog extends React.Component {
         return (
             <BaseDialog className='mx_UserSettingsDialog' hasCancel={true}
                         onFinished={this.props.onFinished} title={_t("Settings")}>
-                <div className='ms_SettingsDialog_content'>
+                <div className='mx_SettingsDialog_content'>
                     <TabbedView tabs={this._getTabs()} initialTabId={this.props.initialTabId} />
                 </div>
             </BaseDialog>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index fa7f446b7c..b777adcf0c 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2875,5 +2875,7 @@
     "Esc": "Esc",
     "Enter": "Enter",
     "Space": "Space",
-    "End": "End"
+    "End": "End",
+    "Decrypted event source": "Decrypted event source",
+    "Original event source": "Original event source"
 }
diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json
index a1275fb089..9dc6d18f8a 100644
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@@ -650,5 +650,7 @@
     "Error upgrading room": "Error upgrading room",
     "Double check that your server supports the room version chosen and try again.": "Double check that your server supports the room version chosen and try again.",
     "Changes the avatar of the current room": "Changes the avatar of the current room",
-    "Changes your avatar in all rooms": "Changes your avatar in all rooms"
+    "Changes your avatar in all rooms": "Changes your avatar in all rooms",
+    "Decrypted event source": "Decrypted event source",
+    "Original event source": "Original event source"
 }

From 0a1f372371a73736a720deface3564be172a9953 Mon Sep 17 00:00:00 2001
From: Panagiotis <27917356+panoschal@users.noreply.github.com>
Date: Wed, 3 Mar 2021 23:26:31 +0200
Subject: [PATCH 147/420] fix: lint

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

diff --git a/src/components/structures/ViewSource.js b/src/components/structures/ViewSource.js
index 866f2e0a0b..b57efe1dd3 100644
--- a/src/components/structures/ViewSource.js
+++ b/src/components/structures/ViewSource.js
@@ -19,7 +19,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import SyntaxHighlight from '../views/elements/SyntaxHighlight';
-import {_t, _td} from "../../languageHandler";
+import {_t} from "../../languageHandler";
 import * as sdk from "../../index";
 
 

From 6d792cc08cec87e5ad6a856c5e4c9e593ac974df Mon Sep 17 00:00:00 2001
From: Panagiotis <27917356+panoschal@users.noreply.github.com>
Date: Wed, 3 Mar 2021 23:48:39 +0200
Subject: [PATCH 148/420] feat: use <details> to hide encrypted block

---
 res/css/structures/_ViewSource.scss     |  4 +++
 src/components/structures/ViewSource.js | 47 ++++++++++++++++---------
 2 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/res/css/structures/_ViewSource.scss b/res/css/structures/_ViewSource.scss
index 0cb5dd8f3a..0126c16599 100644
--- a/res/css/structures/_ViewSource.scss
+++ b/res/css/structures/_ViewSource.scss
@@ -43,3 +43,7 @@ limitations under the License.
     word-wrap: break-word;
     white-space: pre-wrap;
 }
+
+.mx_ViewSource_details {
+    margin-top: 0.8em;
+}
diff --git a/src/components/structures/ViewSource.js b/src/components/structures/ViewSource.js
index b57efe1dd3..ca6c0d4226 100644
--- a/src/components/structures/ViewSource.js
+++ b/src/components/structures/ViewSource.js
@@ -36,29 +36,42 @@ export default class ViewSource extends React.Component {
     render() {
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
 
-        const DecryptedSection = <>
-            <div className="mx_ViewSource_separator" />
-            <div className="mx_ViewSource_heading">{_t("Decrypted event source")}</div>
-            <SyntaxHighlight className="json">
-                { JSON.stringify(this.props.decryptedContent, null, 2) }
-            </SyntaxHighlight>
-        </>;
-
-        const OriginalSection = <>
-            <div className="mx_ViewSource_separator" />
-            <div className="mx_ViewSource_heading">{_t("Original event source")}</div>
-            <SyntaxHighlight className="json">
-                { JSON.stringify(this.props.content, null, 2) }
-            </SyntaxHighlight>
-        </>;
+        let content;
+        if (this.props.isEncrypted) {
+            content = <>
+                <details open className="mx_ViewSource_details">
+                    <summary>
+                        <span className="mx_ViewSource_heading">{_t("Decrypted event source")}</span>
+                    </summary>
+                    <SyntaxHighlight className="json">
+                        { JSON.stringify(this.props.decryptedContent, null, 2) }
+                    </SyntaxHighlight>
+                </details>
+                <details className="mx_ViewSource_details">
+                    <summary>
+                        <span className="mx_ViewSource_heading">{_t("Original event source")}</span>
+                    </summary>
+                    <SyntaxHighlight className="json">
+                        { JSON.stringify(this.props.content, null, 2) }
+                    </SyntaxHighlight>
+                </details>
+            </>;
+        } else {
+            content = <>
+                <div className="mx_ViewSource_heading">{_t("Original event source")}</div>
+                <SyntaxHighlight className="json">
+                    { JSON.stringify(this.props.content, null, 2) }
+                </SyntaxHighlight>
+            </>;
+        }
 
         return (
             <BaseDialog className="mx_ViewSource" onFinished={this.props.onFinished} title={_t('View Source')}>
                 <div className="mx_Dialog_content">
                     <div className="mx_ViewSource_label_left">Room ID: { this.props.roomId }</div>
                     <div className="mx_ViewSource_label_left">Event ID: { this.props.eventId }</div>
-                    { this.props.isEncrypted && DecryptedSection }
-                    { OriginalSection }
+                    <div className="mx_ViewSource_separator" />
+                    { content }
                 </div>
             </BaseDialog>
         );

From 725162ee0012c85111859fa54c9058462945e761 Mon Sep 17 00:00:00 2001
From: Panagiotis <27917356+panoschal@users.noreply.github.com>
Date: Thu, 4 Mar 2021 00:09:00 +0200
Subject: [PATCH 149/420] fix: i18n strings

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

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index b777adcf0c..c3752d7942 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2396,7 +2396,6 @@
     "Cancel Sending": "Cancel Sending",
     "Forward Message": "Forward Message",
     "Pin Message": "Pin Message",
-    "View Decrypted Source": "View Decrypted Source",
     "Unhide Preview": "Unhide Preview",
     "Share Permalink": "Share Permalink",
     "Share Message": "Share Message",
@@ -2652,6 +2651,8 @@
     "User menu": "User menu",
     "Community and user menu": "Community and user menu",
     "Could not load user profile": "Could not load user profile",
+    "Decrypted event source": "Decrypted event source",
+    "Original event source": "Original event source",
     "Verify this login": "Verify this login",
     "Session verified": "Session verified",
     "Failed to send email": "Failed to send email",
@@ -2875,7 +2876,5 @@
     "Esc": "Esc",
     "Enter": "Enter",
     "Space": "Space",
-    "End": "End",
-    "Decrypted event source": "Decrypted event source",
-    "Original event source": "Original event source"
+    "End": "End"
 }
diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json
index 9dc6d18f8a..a1275fb089 100644
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@@ -650,7 +650,5 @@
     "Error upgrading room": "Error upgrading room",
     "Double check that your server supports the room version chosen and try again.": "Double check that your server supports the room version chosen and try again.",
     "Changes the avatar of the current room": "Changes the avatar of the current room",
-    "Changes your avatar in all rooms": "Changes your avatar in all rooms",
-    "Decrypted event source": "Decrypted event source",
-    "Original event source": "Original event source"
+    "Changes your avatar in all rooms": "Changes your avatar in all rooms"
 }

From 1cb19554eb3a151706b6b964f0c42f61b58c7a23 Mon Sep 17 00:00:00 2001
From: Ayush Kumar <2580ayush2580@gmail.com>
Date: Thu, 4 Mar 2021 14:03:02 +0530
Subject: [PATCH 150/420] Fix Bottom border of state counters is white on the
 dark theme

---
 res/css/views/rooms/_AuxPanel.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/views/rooms/_AuxPanel.scss b/res/css/views/rooms/_AuxPanel.scss
index 34ef5e01d4..17a6294bf0 100644
--- a/res/css/views/rooms/_AuxPanel.scss
+++ b/res/css/views/rooms/_AuxPanel.scss
@@ -17,7 +17,7 @@ limitations under the License.
 .m_RoomView_auxPanel_stateViews {
     padding: 5px;
     padding-left: 19px;
-    border-bottom: 1px solid #e5e5e5;
+    border-bottom: 1px solid $primary-hairline-color;
 }
 
 .m_RoomView_auxPanel_stateViews_span a {

From f2d2a048e184f597acd5d605c83944e63ecdecb1 Mon Sep 17 00:00:00 2001
From: Jason Robinson <mail@jasonrobinson.me>
Date: Thu, 4 Mar 2021 11:07:14 +0200
Subject: [PATCH 151/420] Ensure HostSignupDialog border colour matches light
 theme

Ensure dialog borders are always white as the HostSignupDialog
does not yet support dark mode or theming in general.
In the future we might want to pass the theme to the called
iframe, should some hosting provider have that need.
---
 res/css/views/dialogs/_HostSignupDialog.scss | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/res/css/views/dialogs/_HostSignupDialog.scss b/res/css/views/dialogs/_HostSignupDialog.scss
index 1378ac9053..ac4bc41951 100644
--- a/res/css/views/dialogs/_HostSignupDialog.scss
+++ b/res/css/views/dialogs/_HostSignupDialog.scss
@@ -19,6 +19,11 @@ limitations under the License.
     max-width: 580px;
     height: 80vh;
     max-height: 600px;
+    // Ensure dialog borders are always white as the HostSignupDialog
+    // does not yet support dark mode or theming in general.
+    // In the future we might want to pass the theme to the called
+    // iframe, should some hosting provider have that need.
+    background-color: #ffffff;
 
     .mx_HostSignupDialog_info {
         text-align: center;

From 63944b9f6da84dc4b385cb3f7f3b995cabab56e4 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 4 Mar 2021 12:22:31 +0000
Subject: [PATCH 152/420] Add the new file

---
 src/Livestream.ts | 52 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 src/Livestream.ts

diff --git a/src/Livestream.ts b/src/Livestream.ts
new file mode 100644
index 0000000000..d4bed63dbd
--- /dev/null
+++ b/src/Livestream.ts
@@ -0,0 +1,52 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.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 { ClientWidgetApi } from "matrix-widget-api";
+import { MatrixClientPeg } from "./MatrixClientPeg";
+import SdkConfig from "./SdkConfig";
+import { ElementWidgetActions } from "./stores/widgets/ElementWidgetActions";
+
+export function getConfigLivestreamUrl() {
+    return SdkConfig.get()["audioStreamUrl"];
+}
+
+async function createLiveStream(roomId: string) {
+    const openIdToken = await MatrixClientPeg.get().getOpenIdToken();
+
+    const url = getConfigLivestreamUrl() + "/createStream";
+
+    const response = await window.fetch(url, {
+        method: 'POST',
+        headers: {
+            "Content-Type": "application/json",
+        },
+        body: JSON.stringify({
+            room_id: roomId,
+            openid_token: openIdToken,
+        }),
+    });
+
+    const respBody = response.json();
+    return respBody['stream_id'];
+}
+
+export async function startJitsiAudioLivestream(widgetMessaging: ClientWidgetApi, roomId: string) {
+    const streamId = await createLiveStream(roomId);
+
+    widgetMessaging.transport.send(ElementWidgetActions.StartLiveStream, {
+        rtmpStreamKey: 'audioStream:' + streamId,
+    });
+}

From ab4220b20d98d4e47574f945baee64bbf2ec3b48 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 4 Mar 2021 13:04:58 +0000
Subject: [PATCH 153/420] Defer auto-joining within spaces and switch to using
 `suggested`

---
 .../structures/SpaceRoomDirectory.tsx         | 33 ++++++++++---------
 src/i18n/strings/en_EN.json                   |  2 +-
 src/stores/SpaceStore.tsx                     |  3 +-
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/components/structures/SpaceRoomDirectory.tsx b/src/components/structures/SpaceRoomDirectory.tsx
index 7f7b9dbb99..0a59ac0195 100644
--- a/src/components/structures/SpaceRoomDirectory.tsx
+++ b/src/components/structures/SpaceRoomDirectory.tsx
@@ -64,6 +64,7 @@ export interface ISpaceSummaryEvent {
     state_key: string;
     content: {
         order?: string;
+        suggested?: boolean;
         auto_join?: boolean;
         via?: string;
     };
@@ -91,7 +92,7 @@ const SubSpace: React.FC<ISubspaceProps> = ({
     const name = space.name || space.canonical_alias || space.aliases?.[0] || _t("Unnamed Space");
 
     const evContent = event?.getContent();
-    const [autoJoin, _setAutoJoin] = useState(evContent?.auto_join);
+    const [suggested, _setSuggested] = useState(evContent?.suggested);
     const [removed, _setRemoved] = useState(!evContent?.via);
 
     const cli = MatrixClientPeg.get();
@@ -102,12 +103,12 @@ const SubSpace: React.FC<ISubspaceProps> = ({
     let actions;
     if (editing && queueAction) {
         if (event && cli.getRoom(event.getRoomId())?.currentState.maySendStateEvent(event.getType(), cli.getUserId())) {
-            const setAutoJoin = () => {
-                _setAutoJoin(v => {
+            const setSuggested = () => {
+                _setSuggested(v => {
                     queueAction({
                         event,
                         removed,
-                        autoJoin: !v,
+                        suggested: !v,
                     });
                     return !v;
                 });
@@ -118,7 +119,7 @@ const SubSpace: React.FC<ISubspaceProps> = ({
                     queueAction({
                         event,
                         removed: !v,
-                        autoJoin,
+                        suggested,
                     });
                     return !v;
                 });
@@ -131,7 +132,7 @@ const SubSpace: React.FC<ISubspaceProps> = ({
             } else {
                 actions = <React.Fragment>
                     <FormButton kind="danger" onClick={setRemoved} label={_t("Remove from Space")} />
-                    <StyledCheckbox checked={autoJoin} onChange={setAutoJoin} />
+                    <StyledCheckbox checked={suggested} onChange={setSuggested} />
                 </React.Fragment>;
             }
         } else {
@@ -180,8 +181,8 @@ const SubSpace: React.FC<ISubspaceProps> = ({
 
 interface IAction {
     event: MatrixEvent;
+    suggested: boolean;
     removed: boolean;
-    autoJoin: boolean;
 }
 
 interface IRoomTileProps {
@@ -197,7 +198,7 @@ const RoomTile = ({ room, event, editing, queueAction, onPreviewClick, onJoinCli
     const name = room.name || room.canonical_alias || room.aliases?.[0] || _t("Unnamed Room");
 
     const evContent = event?.getContent();
-    const [autoJoin, _setAutoJoin] = useState(evContent?.auto_join);
+    const [suggested, _setSuggested] = useState(evContent?.suggested);
     const [removed, _setRemoved] = useState(!evContent?.via);
 
     const cli = MatrixClientPeg.get();
@@ -207,12 +208,12 @@ const RoomTile = ({ room, event, editing, queueAction, onPreviewClick, onJoinCli
     let actions;
     if (editing && queueAction) {
         if (event && cli.getRoom(event.getRoomId())?.currentState.maySendStateEvent(event.getType(), cli.getUserId())) {
-            const setAutoJoin = () => {
-                _setAutoJoin(v => {
+            const setSuggested = () => {
+                _setSuggested(v => {
                     queueAction({
                         event,
                         removed,
-                        autoJoin: !v,
+                        suggested: !v,
                     });
                     return !v;
                 });
@@ -223,7 +224,7 @@ const RoomTile = ({ room, event, editing, queueAction, onPreviewClick, onJoinCli
                     queueAction({
                         event,
                         removed: !v,
-                        autoJoin,
+                        suggested,
                     });
                     return !v;
                 });
@@ -236,7 +237,7 @@ const RoomTile = ({ room, event, editing, queueAction, onPreviewClick, onJoinCli
             } else {
                 actions = <React.Fragment>
                     <FormButton kind="danger" onClick={setRemoved} label={_t("Remove from Space")} />
-                    <StyledCheckbox checked={autoJoin} onChange={setAutoJoin} />
+                    <StyledCheckbox checked={suggested} onChange={setSuggested} />
                 </React.Fragment>;
             }
         } else {
@@ -441,10 +442,10 @@ const SpaceRoomDirectory: React.FC<IProps> = ({ space, initialText = "", onFinis
 
         const onSaveButtonClicked = () => {
             // TODO setBusy
-            pendingActions.current.forEach(({event, autoJoin, removed}) => {
+            pendingActions.current.forEach(({event, suggested, removed}) => {
                 const content = {
                     ...event.getContent(),
-                    auto_join: autoJoin,
+                    suggested,
                 };
 
                 if (removed) {
@@ -459,7 +460,7 @@ const SpaceRoomDirectory: React.FC<IProps> = ({ space, initialText = "", onFinis
         if (isEditing) {
             adminButton = <React.Fragment>
                 <FormButton label={_t("Save changes")} onClick={onSaveButtonClicked} />
-                <span>{ _t("All users join by default") }</span>
+                <span>{ _t("Promoted to users") }</span>
             </React.Fragment>;
         } else {
             adminButton = <FormButton label={_t("Manage rooms")} onClick={onManageButtonClicked} />;
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index e256e6bb2f..7b680b6590 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2596,7 +2596,7 @@
     "You're in this space": "You're in this space",
     "You're in this room": "You're in this room",
     "Save changes": "Save changes",
-    "All users join by default": "All users join by default",
+    "Promoted to users": "Promoted to users",
     "Manage rooms": "Manage rooms",
     "Find a room...": "Find a room...",
     "Accept Invite": "Accept Invite",
diff --git a/src/stores/SpaceStore.tsx b/src/stores/SpaceStore.tsx
index 8e0066da91..c334144d70 100644
--- a/src/stores/SpaceStore.tsx
+++ b/src/stores/SpaceStore.tsx
@@ -108,9 +108,10 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
         }
     }
 
-    public addRoomToSpace(space: Room, roomId: string, via: string[], autoJoin = false) {
+    public addRoomToSpace(space: Room, roomId: string, via: string[], suggested = false, autoJoin = false) {
         return this.matrixClient.sendStateEvent(space.roomId, EventType.SpaceChild, {
             via,
+            suggested,
             auto_join: autoJoin,
         }, roomId);
     }

From dd792c3d7329400bf67c95cf671190203d54afd7 Mon Sep 17 00:00:00 2001
From: Ayush Kumar <2580ayush2580@gmail.com>
Date: Thu, 4 Mar 2021 19:24:35 +0530
Subject: [PATCH 154/420] Fix Clicking on the avatar for opening member info
 requires pixel-perfect accuracy

---
 res/css/views/rooms/_GroupLayout.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/views/rooms/_GroupLayout.scss b/res/css/views/rooms/_GroupLayout.scss
index 903fabc8fd..818509785b 100644
--- a/res/css/views/rooms/_GroupLayout.scss
+++ b/res/css/views/rooms/_GroupLayout.scss
@@ -21,7 +21,7 @@ $left-gutter: 64px;
     .mx_EventTile {
         > .mx_SenderProfile {
             line-height: $font-20px;
-            padding-left: $left-gutter;
+            margin-left: $left-gutter;
         }
 
         > .mx_EventTile_line {

From 0f1b7a001e1b943ff28acc664b009264cc7fd588 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 4 Mar 2021 17:52:49 +0000
Subject: [PATCH 155/420] Better error handling for streams

Also use older youtubeStreamKey as it appears our jitsi doesn't
support the newer one.
---
 src/Livestream.ts                                 |  6 +++---
 .../views/context_menus/WidgetContextMenu.tsx     | 15 +++++++++++++--
 src/i18n/strings/en_EN.json                       |  2 ++
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/Livestream.ts b/src/Livestream.ts
index d4bed63dbd..cd8cdea179 100644
--- a/src/Livestream.ts
+++ b/src/Livestream.ts
@@ -39,14 +39,14 @@ async function createLiveStream(roomId: string) {
         }),
     });
 
-    const respBody = response.json();
+    const respBody = await response.json();
     return respBody['stream_id'];
 }
 
 export async function startJitsiAudioLivestream(widgetMessaging: ClientWidgetApi, roomId: string) {
     const streamId = await createLiveStream(roomId);
 
-    widgetMessaging.transport.send(ElementWidgetActions.StartLiveStream, {
-        rtmpStreamKey: 'audioStream:' + streamId,
+    await widgetMessaging.transport.send(ElementWidgetActions.StartLiveStream, {
+        rtmpStreamKey: 'rtmp://audiostream.dummy/' + streamId,
     });
 }
diff --git a/src/components/views/context_menus/WidgetContextMenu.tsx b/src/components/views/context_menus/WidgetContextMenu.tsx
index e7d1c02c66..0503df038a 100644
--- a/src/components/views/context_menus/WidgetContextMenu.tsx
+++ b/src/components/views/context_menus/WidgetContextMenu.tsx
@@ -28,6 +28,7 @@ import dis from "../../../dispatcher/dispatcher";
 import SettingsStore from "../../../settings/SettingsStore";
 import Modal from "../../../Modal";
 import QuestionDialog from "../dialogs/QuestionDialog";
+import ErrorDialog from "../dialogs/ErrorDialog";
 import {WidgetType} from "../../../widgets/WidgetType";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import { Container, WidgetLayoutStore } from "../../../stores/widgets/WidgetLayoutStore";
@@ -57,8 +58,18 @@ const WidgetContextMenu: React.FC<IProps> = ({
 
     let streamAudioStreamButton;
     if (getConfigLivestreamUrl() && (app.type === "m.jitsi" || app.type === "jitsi")) {
-        const onStreamAudioClick = () => {
-            startJitsiAudioLivestream(widgetMessaging, roomId);
+        const onStreamAudioClick = async () => {
+            try {
+                await startJitsiAudioLivestream(widgetMessaging, roomId);
+            } catch (err) {
+                console.log("Failed to start livestream", err);
+                // XXX: won't i18n well, but looks like widget api only support 'message'?
+                const message = err.message || _t("Unable to start audio streaming.");
+                Modal.createTrackedDialog('WidgetContext Menu', 'Livestream failed', ErrorDialog, {
+                    title: _t('Failed to start livestream'),
+                    description: message,
+                });
+            }
             onFinished();
         };
         streamAudioStreamButton = <IconizedContextMenuOption
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 7242ed7de6..f33c4368ef 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2357,6 +2357,8 @@
     "Set status": "Set status",
     "Set a new status...": "Set a new status...",
     "View Community": "View Community",
+    "Failed to start livestream": "Failed to start livestream",
+    "Unable to start audio streaming.": "Unable to start audio streaming.",
     "Start audio stream": "Start audio stream",
     "Take a picture": "Take a picture",
     "Delete Widget": "Delete Widget",

From aaf653dd8f0f616792569b888224958d9be99fba Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 4 Mar 2021 17:58:43 +0000
Subject: [PATCH 156/420] 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 f33c4368ef..2183a0c68f 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2357,8 +2357,8 @@
     "Set status": "Set status",
     "Set a new status...": "Set a new status...",
     "View Community": "View Community",
-    "Failed to start livestream": "Failed to start livestream",
     "Unable to start audio streaming.": "Unable to start audio streaming.",
+    "Failed to start livestream": "Failed to start livestream",
     "Start audio stream": "Start audio stream",
     "Take a picture": "Take a picture",
     "Delete Widget": "Delete Widget",

From af5cfff51db48c4a96c5393a25c76675839e864d Mon Sep 17 00:00:00 2001
From: Panagiotis <27917356+panoschal@users.noreply.github.com>
Date: Thu, 4 Mar 2021 23:17:29 +0200
Subject: [PATCH 157/420] feat: edit button on View Source dialog

reuse component SendCustomEvent
swap it in place in the View Source dialog
the Back button takes you to the View Source dialog, not the DevTools dialog
do not display the flip toggle box for changing between State Event and Normal Event
---
 src/components/structures/ViewSource.js       | 180 ++++++++++++++----
 .../views/context_menus/MessageContextMenu.js |  14 +-
 .../views/dialogs/DevtoolsDialog.js           |   7 +-
 3 files changed, 152 insertions(+), 49 deletions(-)

diff --git a/src/components/structures/ViewSource.js b/src/components/structures/ViewSource.js
index ca6c0d4226..7fe862cff5 100644
--- a/src/components/structures/ViewSource.js
+++ b/src/components/structures/ViewSource.js
@@ -16,12 +16,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from 'react';
-import PropTypes from 'prop-types';
-import SyntaxHighlight from '../views/elements/SyntaxHighlight';
-import {_t} from "../../languageHandler";
+import React from "react";
+import PropTypes from "prop-types";
+import SyntaxHighlight from "../views/elements/SyntaxHighlight";
+import { _t } from "../../languageHandler";
 import * as sdk from "../../index";
-
+import MatrixClientContext from "../../contexts/MatrixClientContext";
+import { SendCustomEvent } from "../views/dialogs/DevtoolsDialog";
 
 export default class ViewSource extends React.Component {
     static propTypes = {
@@ -31,48 +32,157 @@ export default class ViewSource extends React.Component {
         eventId: PropTypes.string.isRequired,
         isEncrypted: PropTypes.bool.isRequired,
         decryptedContent: PropTypes.object,
+        event: PropTypes.object.isRequired, // the MatrixEvent associated with the context menu
     };
 
+    constructor(props) {
+        super(props);
+
+        this.state = {
+            editComponent: null,
+        };
+    }
+
+    onBack() {
+        this.setState({ editComponent: null });
+    }
+
+    editEvent() {
+        const isStateEvent = this.props.event.isState();
+        console.log("isStateEvent", isStateEvent);
+        if (isStateEvent) {
+            this.setState({
+                editComponent: (
+                    <MatrixClientContext.Consumer>
+                        {(cli) => (
+                            <SendCustomEvent
+                                room={cli.getRoom(this.props.roomId)}
+                                forceStateEvent={true}
+                                onBack={() => this.onBack()}
+                                inputs={{
+                                    eventType: this.props.event.getType(),
+                                    evContent: JSON.stringify(
+                                        this.props.event.getContent(),
+                                        null,
+                                        "\t"
+                                    ),
+                                    stateKey: this.props.event.getStateKey(),
+                                }}
+                            />
+                        )}
+                    </MatrixClientContext.Consumer>
+                ),
+            });
+        } else {
+            // send an edit-message event
+            // prefill the "m.new_content" field
+            const originalContent = this.props.event.getContent();
+            const originalEventId = this.props.eventId;
+            const content = {
+                ...originalContent,
+                "m.new_content": originalContent,
+                "m.relates_to": {
+                    rel_type: "m.replace",
+                    event_id: originalEventId,
+                },
+            };
+            this.setState({
+                editComponent: (
+                    <MatrixClientContext.Consumer>
+                        {(cli) => (
+                            <SendCustomEvent
+                                room={cli.getRoom(this.props.roomId)}
+                                forceStateEvent={false}
+                                forceGeneralEvent={true}
+                                onBack={() => this.onBack()}
+                                inputs={{
+                                    eventType: this.props.event.getType(),
+                                    evContent: JSON.stringify(
+                                        content,
+                                        null,
+                                        "\t"
+                                    ),
+                                }}
+                            />
+                        )}
+                    </MatrixClientContext.Consumer>
+                ),
+            });
+        }
+    }
+
     render() {
-        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
+        const BaseDialog = sdk.getComponent("views.dialogs.BaseDialog");
 
         let content;
         if (this.props.isEncrypted) {
-            content = <>
-                <details open className="mx_ViewSource_details">
-                    <summary>
-                        <span className="mx_ViewSource_heading">{_t("Decrypted event source")}</span>
-                    </summary>
-                    <SyntaxHighlight className="json">
-                        { JSON.stringify(this.props.decryptedContent, null, 2) }
-                    </SyntaxHighlight>
-                </details>
-                <details className="mx_ViewSource_details">
-                    <summary>
-                        <span className="mx_ViewSource_heading">{_t("Original event source")}</span>
-                    </summary>
-                    <SyntaxHighlight className="json">
-                        { JSON.stringify(this.props.content, null, 2) }
-                    </SyntaxHighlight>
-                </details>
-            </>;
+            content = (
+                <>
+                    <details open className="mx_ViewSource_details">
+                        <summary>
+                            <span className="mx_ViewSource_heading">
+                                {_t("Decrypted event source")}
+                            </span>
+                        </summary>
+                        <SyntaxHighlight className="json">
+                            {JSON.stringify(
+                                this.props.decryptedContent,
+                                null,
+                                2
+                            )}
+                        </SyntaxHighlight>
+                    </details>
+                    <details className="mx_ViewSource_details">
+                        <summary>
+                            <span className="mx_ViewSource_heading">
+                                {_t("Original event source")}
+                            </span>
+                        </summary>
+                        <SyntaxHighlight className="json">
+                            {JSON.stringify(this.props.content, null, 2)}
+                        </SyntaxHighlight>
+                    </details>
+                </>
+            );
         } else {
-            content = <>
-                <div className="mx_ViewSource_heading">{_t("Original event source")}</div>
-                <SyntaxHighlight className="json">
-                    { JSON.stringify(this.props.content, null, 2) }
-                </SyntaxHighlight>
-            </>;
+            content = (
+                <>
+                    <div className="mx_ViewSource_heading">
+                        {_t("Original event source")}
+                    </div>
+                    <SyntaxHighlight className="json">
+                        {JSON.stringify(this.props.content, null, 2)}
+                    </SyntaxHighlight>
+                </>
+            );
         }
 
+        const isEditing = this.state.editComponent !== null;
+        console.log(isEditing);
+
         return (
-            <BaseDialog className="mx_ViewSource" onFinished={this.props.onFinished} title={_t('View Source')}>
-                <div className="mx_Dialog_content">
-                    <div className="mx_ViewSource_label_left">Room ID: { this.props.roomId }</div>
-                    <div className="mx_ViewSource_label_left">Event ID: { this.props.eventId }</div>
+            <BaseDialog
+                className="mx_ViewSource"
+                onFinished={this.props.onFinished}
+                title={_t("View Source")}
+            >
+                <div>
+                    <div className="mx_ViewSource_label_left">
+                        Room ID: {this.props.roomId}
+                    </div>
+                    <div className="mx_ViewSource_label_left">
+                        Event ID: {this.props.eventId}
+                    </div>
                     <div className="mx_ViewSource_separator" />
-                    { content }
+                    {isEditing ? this.state.editComponent : content}
                 </div>
+                {!isEditing && (
+                    <div className="mx_Dialog_buttons">
+                        <button onClick={() => this.editEvent()}>
+                            {_t("Edit")}
+                        </button>
+                    </div>
+                )}
             </BaseDialog>
         );
     }
diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js
index b002d1ec62..a1c111b19c 100644
--- a/src/components/views/context_menus/MessageContextMenu.js
+++ b/src/components/views/context_menus/MessageContextMenu.js
@@ -130,20 +130,10 @@ export default class MessageContextMenu extends React.Component {
             roomId: ev.getRoomId(),
             eventId: ev.getId(),
             content: ev.event,
+            event: ev,
             isEncrypted: this.props.mxEvent.getType() !== this.props.mxEvent.getWireType(),
-            decryptedContent: ev._clearEvent,
-        }, 'mx_Dialog_viewsource');
-        this.closeMenu();
-    };
-
-    onViewClearSourceClick = () => {
-        const ev = this.props.mxEvent.replacingEvent() || this.props.mxEvent;
-        const ViewSource = sdk.getComponent('structures.ViewSource');
-        Modal.createTrackedDialog('View Clear Event Source', '', ViewSource, {
-            roomId: ev.getRoomId(),
-            eventId: ev.getId(),
             // FIXME: _clearEvent is private
-            content: ev._clearEvent,
+            decryptedContent: ev._clearEvent,
         }, 'mx_Dialog_viewsource');
         this.closeMenu();
     };
diff --git a/src/components/views/dialogs/DevtoolsDialog.js b/src/components/views/dialogs/DevtoolsDialog.js
index 814378bb51..5d571461fc 100644
--- a/src/components/views/dialogs/DevtoolsDialog.js
+++ b/src/components/views/dialogs/DevtoolsDialog.js
@@ -73,13 +73,14 @@ class GenericEditor extends React.PureComponent {
     }
 }
 
-class SendCustomEvent extends GenericEditor {
+export class SendCustomEvent extends GenericEditor {
     static getLabel() { return _t('Send Custom Event'); }
 
     static propTypes = {
         onBack: PropTypes.func.isRequired,
         room: PropTypes.instanceOf(Room).isRequired,
         forceStateEvent: PropTypes.bool,
+        forceGeneralEvent: PropTypes.bool,
         inputs: PropTypes.object,
     };
 
@@ -140,6 +141,8 @@ class SendCustomEvent extends GenericEditor {
             </div>;
         }
 
+        const showTglFlip = !this.state.message && !this.props.forceStateEvent && !this.props.forceGeneralEvent;
+        
         return <div>
             <div className="mx_DevTools_content">
                 <div className="mx_DevTools_eventTypeStateKeyGroup">
@@ -155,7 +158,7 @@ class SendCustomEvent extends GenericEditor {
             <div className="mx_Dialog_buttons">
                 <button onClick={this.onBack}>{ _t('Back') }</button>
                 { !this.state.message && <button onClick={this._send}>{ _t('Send') }</button> }
-                { !this.state.message && !this.props.forceStateEvent && <div style={{float: "right"}}>
+                { showTglFlip && <div style={{float: "right"}}>
                     <input id="isStateEvent" className="mx_DevTools_tgl mx_DevTools_tgl-flip" type="checkbox" onChange={this._onChange} checked={this.state.isStateEvent} />
                     <label className="mx_DevTools_tgl-btn" data-tg-off="Event" data-tg-on="State Event" htmlFor="isStateEvent" />
                 </div> }

From 288d98daede9f1ea6b1045e6de930c61f5f14c0e Mon Sep 17 00:00:00 2001
From: Panagiotis <27917356+panoschal@users.noreply.github.com>
Date: Fri, 5 Mar 2021 00:07:59 +0200
Subject: [PATCH 158/420] chore: format, lint

---
 src/components/structures/ViewSource.js       | 58 ++++---------------
 .../views/dialogs/DevtoolsDialog.js           |  2 +-
 2 files changed, 13 insertions(+), 47 deletions(-)

diff --git a/src/components/structures/ViewSource.js b/src/components/structures/ViewSource.js
index 7fe862cff5..a31876ea76 100644
--- a/src/components/structures/ViewSource.js
+++ b/src/components/structures/ViewSource.js
@@ -61,11 +61,7 @@ export default class ViewSource extends React.Component {
                                 onBack={() => this.onBack()}
                                 inputs={{
                                     eventType: this.props.event.getType(),
-                                    evContent: JSON.stringify(
-                                        this.props.event.getContent(),
-                                        null,
-                                        "\t"
-                                    ),
+                                    evContent: JSON.stringify(this.props.event.getContent(), null, "\t"),
                                     stateKey: this.props.event.getStateKey(),
                                 }}
                             />
@@ -97,11 +93,7 @@ export default class ViewSource extends React.Component {
                                 onBack={() => this.onBack()}
                                 inputs={{
                                     eventType: this.props.event.getType(),
-                                    evContent: JSON.stringify(
-                                        content,
-                                        null,
-                                        "\t"
-                                    ),
+                                    evContent: JSON.stringify(content, null, "\t"),
                                 }}
                             />
                         )}
@@ -120,39 +112,23 @@ export default class ViewSource extends React.Component {
                 <>
                     <details open className="mx_ViewSource_details">
                         <summary>
-                            <span className="mx_ViewSource_heading">
-                                {_t("Decrypted event source")}
-                            </span>
+                            <span className="mx_ViewSource_heading">{_t("Decrypted event source")}</span>
                         </summary>
-                        <SyntaxHighlight className="json">
-                            {JSON.stringify(
-                                this.props.decryptedContent,
-                                null,
-                                2
-                            )}
-                        </SyntaxHighlight>
+                        <SyntaxHighlight className="json">{JSON.stringify(this.props.decryptedContent, null, 2)}</SyntaxHighlight>
                     </details>
                     <details className="mx_ViewSource_details">
                         <summary>
-                            <span className="mx_ViewSource_heading">
-                                {_t("Original event source")}
-                            </span>
+                            <span className="mx_ViewSource_heading">{_t("Original event source")}</span>
                         </summary>
-                        <SyntaxHighlight className="json">
-                            {JSON.stringify(this.props.content, null, 2)}
-                        </SyntaxHighlight>
+                        <SyntaxHighlight className="json">{JSON.stringify(this.props.content, null, 2)}</SyntaxHighlight>
                     </details>
                 </>
             );
         } else {
             content = (
                 <>
-                    <div className="mx_ViewSource_heading">
-                        {_t("Original event source")}
-                    </div>
-                    <SyntaxHighlight className="json">
-                        {JSON.stringify(this.props.content, null, 2)}
-                    </SyntaxHighlight>
+                    <div className="mx_ViewSource_heading">{_t("Original event source")}</div>
+                    <SyntaxHighlight className="json">{JSON.stringify(this.props.content, null, 2)}</SyntaxHighlight>
                 </>
             );
         }
@@ -161,26 +137,16 @@ export default class ViewSource extends React.Component {
         console.log(isEditing);
 
         return (
-            <BaseDialog
-                className="mx_ViewSource"
-                onFinished={this.props.onFinished}
-                title={_t("View Source")}
-            >
+            <BaseDialog className="mx_ViewSource" onFinished={this.props.onFinished} title={_t("View Source")}>
                 <div>
-                    <div className="mx_ViewSource_label_left">
-                        Room ID: {this.props.roomId}
-                    </div>
-                    <div className="mx_ViewSource_label_left">
-                        Event ID: {this.props.eventId}
-                    </div>
+                    <div className="mx_ViewSource_label_left">Room ID: {this.props.roomId}</div>
+                    <div className="mx_ViewSource_label_left">Event ID: {this.props.eventId}</div>
                     <div className="mx_ViewSource_separator" />
                     {isEditing ? this.state.editComponent : content}
                 </div>
                 {!isEditing && (
                     <div className="mx_Dialog_buttons">
-                        <button onClick={() => this.editEvent()}>
-                            {_t("Edit")}
-                        </button>
+                        <button onClick={() => this.editEvent()}>{_t("Edit")}</button>
                     </div>
                 )}
             </BaseDialog>
diff --git a/src/components/views/dialogs/DevtoolsDialog.js b/src/components/views/dialogs/DevtoolsDialog.js
index 5d571461fc..82f2df6534 100644
--- a/src/components/views/dialogs/DevtoolsDialog.js
+++ b/src/components/views/dialogs/DevtoolsDialog.js
@@ -142,7 +142,7 @@ export class SendCustomEvent extends GenericEditor {
         }
 
         const showTglFlip = !this.state.message && !this.props.forceStateEvent && !this.props.forceGeneralEvent;
-        
+
         return <div>
             <div className="mx_DevTools_content">
                 <div className="mx_DevTools_eventTypeStateKeyGroup">

From 5d6e3d5711b56eddb764e0ee8924b20c4e5ed5e2 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 4 Mar 2021 20:07:48 -0700
Subject: [PATCH 159/420] UI refresh for uploaded files

Fixes https://github.com/vector-im/element-web/issues/16557
Fixes https://github.com/vector-im/element-web/issues/9482 (technically)

There's two changes in this:
1. The actual file body in the timeline now has a placeholder thing.
2. We're intentionally dropping all the "Travis uploaded a file" sender profile states.
---
 res/css/views/messages/_MFileBody.scss        | 43 +++++++++++++++++++
 res/themes/dark/css/_dark.scss                |  4 ++
 res/themes/legacy-dark/css/_legacy-dark.scss  |  4 ++
 .../legacy-light/css/_legacy-light.scss       |  4 ++
 res/themes/light/css/_light.scss              |  4 ++
 src/components/views/messages/MAudioBody.js   |  2 +-
 src/components/views/messages/MFileBody.js    | 26 ++++++++++-
 src/components/views/messages/MImageBody.js   |  2 +-
 src/components/views/messages/MVideoBody.tsx  |  2 +-
 .../views/messages/SenderProfile.js           | 10 +----
 src/components/views/rooms/EventTile.js       |  7 +--
 src/i18n/strings/en_EN.json                   |  3 --
 12 files changed, 88 insertions(+), 23 deletions(-)

diff --git a/res/css/views/messages/_MFileBody.scss b/res/css/views/messages/_MFileBody.scss
index 6cbce68745..e219c0c5e4 100644
--- a/res/css/views/messages/_MFileBody.scss
+++ b/res/css/views/messages/_MFileBody.scss
@@ -45,3 +45,46 @@ limitations under the License.
      * big the content of the iframe is. */
     height: 1.5em;
 }
+
+.mx_MFileBody_info {
+    background-color: $message-body-panel-bg-color;
+    border-radius: 4px;
+    width: 270px;
+    padding: 8px;
+    color: $message-body-panel-fg-color;
+
+    .mx_MFileBody_info_icon {
+        background-color: $message-body-panel-icon-bg-color;
+        border-radius: 20px;
+        display: inline-block;
+        width: 32px;
+        height: 32px;
+        position: relative;
+        vertical-align: middle;
+        margin-right: 12px;
+
+        &::before {
+            content: '';
+            mask-repeat: no-repeat;
+            mask-position: center;
+            mask-size: cover;
+            mask-image: url('$(res)/img/element-icons/room/composer/attach.svg');
+            background-color: $message-body-panel-fg-color;
+            width: 13px;
+            height: 15px;
+
+            position: absolute;
+            top: 8px;
+            left: 9px;
+        }
+    }
+
+    .mx_MFileBody_info_filename {
+        text-overflow: ellipsis;
+        overflow: hidden;
+        white-space: nowrap;
+        display: inline-block;
+        width: calc(100% - 32px - 12px); // 32px icon, 12px margin on the icon
+        vertical-align: middle;
+    }
+}
diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss
index 0de5e69782..a4648d2051 100644
--- a/res/themes/dark/css/_dark.scss
+++ b/res/themes/dark/css/_dark.scss
@@ -203,6 +203,10 @@ $breadcrumb-placeholder-bg-color: #272c35;
 
 $user-tile-hover-bg-color: $header-panel-bg-color;
 
+$message-body-panel-bg-color: #21262c82;
+$message-body-panel-icon-bg-color: #8e99a4;
+$message-body-panel-fg-color: $primary-fg-color;
+
 // Appearance tab colors
 $appearance-tab-border-color: $room-highlight-color;
 
diff --git a/res/themes/legacy-dark/css/_legacy-dark.scss b/res/themes/legacy-dark/css/_legacy-dark.scss
index 8c5f20178b..8752e41d18 100644
--- a/res/themes/legacy-dark/css/_legacy-dark.scss
+++ b/res/themes/legacy-dark/css/_legacy-dark.scss
@@ -198,6 +198,10 @@ $breadcrumb-placeholder-bg-color: #272c35;
 
 $user-tile-hover-bg-color: $header-panel-bg-color;
 
+$message-body-panel-bg-color: #21262c82;
+$message-body-panel-icon-bg-color: #8e99a4;
+$message-body-panel-fg-color: $primary-fg-color;
+
 // Appearance tab colors
 $appearance-tab-border-color: $room-highlight-color;
 
diff --git a/res/themes/legacy-light/css/_legacy-light.scss b/res/themes/legacy-light/css/_legacy-light.scss
index 3ba10a68ea..58b75f32aa 100644
--- a/res/themes/legacy-light/css/_legacy-light.scss
+++ b/res/themes/legacy-light/css/_legacy-light.scss
@@ -322,6 +322,10 @@ $breadcrumb-placeholder-bg-color: #e8eef5;
 
 $user-tile-hover-bg-color: $header-panel-bg-color;
 
+$message-body-panel-bg-color: #e3e8f082;
+$message-body-panel-icon-bg-color: #ffffff;
+$message-body-panel-fg-color: $muted-fg-color;
+
 // FontSlider colors
 $appearance-tab-border-color: $input-darker-bg-color;
 
diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss
index 76bf2ddc21..fd2bfe4628 100644
--- a/res/themes/light/css/_light.scss
+++ b/res/themes/light/css/_light.scss
@@ -323,6 +323,10 @@ $breadcrumb-placeholder-bg-color: #e8eef5;
 
 $user-tile-hover-bg-color: $header-panel-bg-color;
 
+$message-body-panel-bg-color: #e3e8f082;
+$message-body-panel-icon-bg-color: #ffffff;
+$message-body-panel-fg-color: $muted-fg-color;
+
 // FontSlider colors
 $appearance-tab-border-color: $input-darker-bg-color;
 
diff --git a/src/components/views/messages/MAudioBody.js b/src/components/views/messages/MAudioBody.js
index 37f85a108f..587dee4513 100644
--- a/src/components/views/messages/MAudioBody.js
+++ b/src/components/views/messages/MAudioBody.js
@@ -105,7 +105,7 @@ export default class MAudioBody extends React.Component {
         return (
             <span className="mx_MAudioBody">
                 <audio src={contentUrl} controls />
-                <MFileBody {...this.props} decryptedBlob={this.state.decryptedBlob} />
+                <MFileBody {...this.props} decryptedBlob={this.state.decryptedBlob} showGenericPlaceholder={false} />
             </span>
         );
     }
diff --git a/src/components/views/messages/MFileBody.js b/src/components/views/messages/MFileBody.js
index 770cd4fff3..676f0b7986 100644
--- a/src/components/views/messages/MFileBody.js
+++ b/src/components/views/messages/MFileBody.js
@@ -126,6 +126,12 @@ export default class MFileBody extends React.Component {
         onHeightChanged: PropTypes.func,
         /* the shape of the tile, used */
         tileShape: PropTypes.string,
+        /* whether or not to show the default placeholder for the file. Defaults to true. */
+        showGenericPlaceholder: PropTypes.bool,
+    };
+
+    static defaultProps = {
+        showGenericPlaceholder: true,
     };
 
     constructor(props) {
@@ -145,9 +151,10 @@ export default class MFileBody extends React.Component {
      * link text.
      *
      * @param {Object} content The "content" key of the matrix event.
+     * @param {boolean} withSize Whether to include size information. Default true.
      * @return {string} the human readable link text for the attachment.
      */
-    presentableTextForFile(content) {
+    presentableTextForFile(content, withSize = true) {
         let linkText = _t("Attachment");
         if (content.body && content.body.length > 0) {
             // The content body should be the name of the file including a
@@ -155,7 +162,7 @@ export default class MFileBody extends React.Component {
             linkText = content.body;
         }
 
-        if (content.info && content.info.size) {
+        if (content.info && content.info.size && withSize) {
             // If we know the size of the file then add it as human readable
             // string to the end of the link text so that the user knows how
             // big a file they are downloading.
@@ -218,6 +225,16 @@ export default class MFileBody extends React.Component {
         const fileSize = content.info ? content.info.size : null;
         const fileType = content.info ? content.info.mimetype : "application/octet-stream";
 
+        let placeholder = null;
+        if (this.props.showGenericPlaceholder) {
+            placeholder = (
+                <div className="mx_MFileBody_info">
+                    <span className="mx_MFileBody_info_icon" />
+                    <span className="mx_MFileBody_info_filename">{this.presentableTextForFile(content, false)}</span>
+                </div>
+            );
+        }
+
         if (isEncrypted) {
             if (this.state.decryptedBlob === null) {
                 // Need to decrypt the attachment
@@ -248,6 +265,7 @@ export default class MFileBody extends React.Component {
                 // but it is not guaranteed between various browsers' settings.
                 return (
                     <span className="mx_MFileBody">
+                        {placeholder}
                         <div className="mx_MFileBody_download">
                             <AccessibleButton onClick={decrypt}>
                                 { _t("Decrypt %(text)s", { text: text }) }
@@ -278,6 +296,7 @@ export default class MFileBody extends React.Component {
             // If the attachment is encrypted then put the link inside an iframe.
             return (
                 <span className="mx_MFileBody">
+                    {placeholder}
                     <div className="mx_MFileBody_download">
                         <div style={{display: "none"}}>
                             { /*
@@ -346,6 +365,7 @@ export default class MFileBody extends React.Component {
             if (this.props.tileShape === "file_grid") {
                 return (
                     <span className="mx_MFileBody">
+                        {placeholder}
                         <div className="mx_MFileBody_download">
                             <a className="mx_MFileBody_downloadLink" {...downloadProps}>
                                 { fileName }
@@ -359,6 +379,7 @@ export default class MFileBody extends React.Component {
             } else {
                 return (
                     <span className="mx_MFileBody">
+                        {placeholder}
                         <div className="mx_MFileBody_download">
                             <a {...downloadProps}>
                                 <img src={tintedDownloadImageURL} width="12" height="14" ref={this._downloadImage} />
@@ -371,6 +392,7 @@ export default class MFileBody extends React.Component {
         } else {
             const extra = text ? (': ' + text) : '';
             return <span className="mx_MFileBody">
+                {placeholder}
                 { _t("Invalid file%(extra)s", { extra: extra }) }
             </span>;
         }
diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js
index a8cdc17abf..771d12accd 100644
--- a/src/components/views/messages/MImageBody.js
+++ b/src/components/views/messages/MImageBody.js
@@ -452,7 +452,7 @@ export default class MImageBody extends React.Component {
 
     // Overidden by MStickerBody
     getFileBody() {
-        return <MFileBody {...this.props} decryptedBlob={this.state.decryptedBlob} />;
+        return <MFileBody {...this.props} decryptedBlob={this.state.decryptedBlob} showGenericPlaceholder={false} />;
     }
 
     render() {
diff --git a/src/components/views/messages/MVideoBody.tsx b/src/components/views/messages/MVideoBody.tsx
index 9628f11809..ce4a4eda76 100644
--- a/src/components/views/messages/MVideoBody.tsx
+++ b/src/components/views/messages/MVideoBody.tsx
@@ -243,7 +243,7 @@ export default class MVideoBody extends React.PureComponent<IProps, IState> {
                     onPlay={this.videoOnPlay}
                 >
                 </video>
-                <MFileBody {...this.props} decryptedBlob={this.state.decryptedBlob} />
+                <MFileBody {...this.props} decryptedBlob={this.state.decryptedBlob} showGenericPlaceholder={false} />
             </span>
         );
     }
diff --git a/src/components/views/messages/SenderProfile.js b/src/components/views/messages/SenderProfile.js
index afe2d6d118..e2bb1ff38d 100644
--- a/src/components/views/messages/SenderProfile.js
+++ b/src/components/views/messages/SenderProfile.js
@@ -25,7 +25,6 @@ import MatrixClientContext from "../../../contexts/MatrixClientContext";
 export default class SenderProfile extends React.Component {
     static propTypes = {
         mxEvent: PropTypes.object.isRequired, // event whose sender we're showing
-        text: PropTypes.string, // Text to show. Defaults to sender name
         onClick: PropTypes.func,
     };
 
@@ -118,17 +117,10 @@ export default class SenderProfile extends React.Component {
             { flair }
         </span>;
 
-        const content = this.props.text ?
-            <span>
-                <span className="mx_SenderProfile_aux">
-                    { _t(this.props.text, { senderName: () => nameElem }) }
-                </span>
-            </span> : nameFlair;
-
         return (
             <div className="mx_SenderProfile" dir="auto" onClick={this.props.onClick}>
                 <div className="mx_SenderProfile_hover">
-                    { content }
+                    { nameFlair }
                 </div>
             </div>
         );
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 87fb190678..2009eb6d1c 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -768,15 +768,10 @@ export default class EventTile extends React.Component {
         }
 
         if (needsSenderProfile) {
-            let text = null;
             if (!this.props.tileShape || this.props.tileShape === 'reply' || this.props.tileShape === 'reply_preview') {
-                if (msgtype === 'm.image') text = _td('%(senderName)s sent an image');
-                else if (msgtype === 'm.video') text = _td('%(senderName)s sent a video');
-                else if (msgtype === 'm.file') text = _td('%(senderName)s uploaded a file');
                 sender = <SenderProfile onClick={this.onSenderProfileClick}
                                         mxEvent={this.props.mxEvent}
-                                        enableFlair={this.props.enableFlair && !text}
-                                        text={text} />;
+                                        enableFlair={this.props.enableFlair} />;
             } else {
                 sender = <SenderProfile mxEvent={this.props.mxEvent} enableFlair={this.props.enableFlair} />;
             }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index a1999acb3b..f3232416b1 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1430,9 +1430,6 @@
     "Edit message": "Edit message",
     "Mod": "Mod",
     "This event could not be displayed": "This event could not be displayed",
-    "%(senderName)s sent an image": "%(senderName)s sent an image",
-    "%(senderName)s sent a video": "%(senderName)s sent a video",
-    "%(senderName)s uploaded a file": "%(senderName)s uploaded a file",
     "Your key share request has been sent - please check your other sessions for key share requests.": "Your key share request has been sent - please check your other sessions for key share requests.",
     "Key share requests are sent to your other sessions automatically. If you rejected or dismissed the key share request on your other sessions, click here to request the keys for this session again.": "Key share requests are sent to your other sessions automatically. If you rejected or dismissed the key share request on your other sessions, click here to request the keys for this session again.",
     "If your other sessions do not have the key for this message you will not be able to decrypt them.": "If your other sessions do not have the key for this message you will not be able to decrypt them.",

From 8d143331a8d8fa72c89b8730f70b9b3ff9ba7009 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 4 Mar 2021 20:10:47 -0700
Subject: [PATCH 160/420] Appease the linter

---
 src/components/views/messages/SenderProfile.js | 1 -
 src/components/views/rooms/EventTile.js        | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/views/messages/SenderProfile.js b/src/components/views/messages/SenderProfile.js
index e2bb1ff38d..d2db05252c 100644
--- a/src/components/views/messages/SenderProfile.js
+++ b/src/components/views/messages/SenderProfile.js
@@ -18,7 +18,6 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import Flair from '../elements/Flair.js';
 import FlairStore from '../../../stores/FlairStore';
-import { _t } from '../../../languageHandler';
 import {getUserNameColorClass} from '../../../utils/FormattingUtils';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 2009eb6d1c..198b3427bc 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -22,7 +22,7 @@ import React, {createRef} from 'react';
 import PropTypes from 'prop-types';
 import classNames from "classnames";
 import {EventType} from "matrix-js-sdk/src/@types/event";
-import { _t, _td } from '../../../languageHandler';
+import { _t } from '../../../languageHandler';
 import * as TextForEvent from "../../../TextForEvent";
 import * as sdk from "../../../index";
 import dis from '../../../dispatcher/dispatcher';

From d7310bc5b36cb66abbee507ff74cea3f56592c70 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 4 Mar 2021 20:17:29 -0700
Subject: [PATCH 161/420] Remove dead classes

---
 res/css/views/rooms/_IRCLayout.scss | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/res/css/views/rooms/_IRCLayout.scss b/res/css/views/rooms/_IRCLayout.scss
index 792c2f1f58..21baa795e6 100644
--- a/res/css/views/rooms/_IRCLayout.scss
+++ b/res/css/views/rooms/_IRCLayout.scss
@@ -181,8 +181,7 @@ $irc-line-height: $font-18px;
         > span {
             display: flex;
 
-            > .mx_SenderProfile_name,
-            > .mx_SenderProfile_aux {
+            > .mx_SenderProfile_name {
                 overflow: hidden;
                 text-overflow: ellipsis;
                 min-width: var(--name-width);
@@ -212,8 +211,7 @@ $irc-line-height: $font-18px;
             background: transparent;
 
             > span {
-                > .mx_SenderProfile_name,
-                > .mx_SenderProfile_aux {
+                > .mx_SenderProfile_name {
                     min-width: inherit;
                 }
             }

From c80cbc38dd28e89d1b643189acb9c659914989dc Mon Sep 17 00:00:00 2001
From: David Baker <dbkr@users.noreply.github.com>
Date: Fri, 5 Mar 2021 10:32:54 +0000
Subject: [PATCH 162/420] Use helper class

(It did not need imports)

Co-authored-by: Travis Ralston <travpc@gmail.com>
---
 src/components/views/context_menus/WidgetContextMenu.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/views/context_menus/WidgetContextMenu.tsx b/src/components/views/context_menus/WidgetContextMenu.tsx
index 0503df038a..03e63edbcc 100644
--- a/src/components/views/context_menus/WidgetContextMenu.tsx
+++ b/src/components/views/context_menus/WidgetContextMenu.tsx
@@ -57,7 +57,7 @@ const WidgetContextMenu: React.FC<IProps> = ({
     const canModify = userWidget || WidgetUtils.canUserModifyWidgets(roomId);
 
     let streamAudioStreamButton;
-    if (getConfigLivestreamUrl() && (app.type === "m.jitsi" || app.type === "jitsi")) {
+    if (getConfigLivestreamUrl() && WidgetType.JITSI.matches(app.type)) {
         const onStreamAudioClick = async () => {
             try {
                 await startJitsiAudioLivestream(widgetMessaging, roomId);
@@ -199,4 +199,3 @@ const WidgetContextMenu: React.FC<IProps> = ({
 };
 
 export default WidgetContextMenu;
-

From 8bcf0f08385368ce0dce69510e814f478aa90e2c Mon Sep 17 00:00:00 2001
From: David Baker <dbkr@users.noreply.github.com>
Date: Fri, 5 Mar 2021 10:34:03 +0000
Subject: [PATCH 163/420] console.error

Co-authored-by: Travis Ralston <travpc@gmail.com>
---
 src/components/views/context_menus/WidgetContextMenu.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/context_menus/WidgetContextMenu.tsx b/src/components/views/context_menus/WidgetContextMenu.tsx
index 03e63edbcc..623fe04f2f 100644
--- a/src/components/views/context_menus/WidgetContextMenu.tsx
+++ b/src/components/views/context_menus/WidgetContextMenu.tsx
@@ -62,7 +62,7 @@ const WidgetContextMenu: React.FC<IProps> = ({
             try {
                 await startJitsiAudioLivestream(widgetMessaging, roomId);
             } catch (err) {
-                console.log("Failed to start livestream", err);
+                console.error("Failed to start livestream", err);
                 // XXX: won't i18n well, but looks like widget api only support 'message'?
                 const message = err.message || _t("Unable to start audio streaming.");
                 Modal.createTrackedDialog('WidgetContext Menu', 'Livestream failed', ErrorDialog, {

From 572f15522f28320f671980a5892ec2cf10fd0d8e Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 5 Mar 2021 10:40:11 +0000
Subject: [PATCH 164/420] use a constant

---
 src/Livestream.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Livestream.ts b/src/Livestream.ts
index cd8cdea179..2389132762 100644
--- a/src/Livestream.ts
+++ b/src/Livestream.ts
@@ -23,6 +23,9 @@ export function getConfigLivestreamUrl() {
     return SdkConfig.get()["audioStreamUrl"];
 }
 
+// Dummy rtmp URL used to signal that we want a special audio-only stream
+const AUDIOSTREAM_DUMMY_URL = 'rtmp://audiostream.dummy/';
+
 async function createLiveStream(roomId: string) {
     const openIdToken = await MatrixClientPeg.get().getOpenIdToken();
 
@@ -47,6 +50,6 @@ export async function startJitsiAudioLivestream(widgetMessaging: ClientWidgetApi
     const streamId = await createLiveStream(roomId);
 
     await widgetMessaging.transport.send(ElementWidgetActions.StartLiveStream, {
-        rtmpStreamKey: 'rtmp://audiostream.dummy/' + streamId,
+        rtmpStreamKey: AUDIOSTREAM_DUMMY_URL + streamId,
     });
 }

From 1c1d239d5b0853e2b6ee56f823020655d2a68a2b Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Fri, 5 Mar 2021 13:19:06 +0000
Subject: [PATCH 165/420] Add Edge to the targets list

Part of https://github.com/vector-im/element-web/issues/9175
---
 babel.config.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/babel.config.js b/babel.config.js
index d5a97d56ce..0a3a34a391 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -3,12 +3,15 @@ module.exports = {
     "presets": [
         ["@babel/preset-env", {
             "targets": [
-                "last 2 Chrome versions", "last 2 Firefox versions", "last 2 Safari versions"
+                "last 2 Chrome versions",
+                "last 2 Firefox versions",
+                "last 2 Safari versions",
+                "last 2 Edge versions",
             ],
         }],
         "@babel/preset-typescript",
         "@babel/preset-flow",
-        "@babel/preset-react"
+        "@babel/preset-react",
     ],
     "plugins": [
         ["@babel/plugin-proposal-decorators", {legacy: true}],
@@ -18,6 +21,6 @@ module.exports = {
         "@babel/plugin-proposal-object-rest-spread",
         "@babel/plugin-transform-flow-comments",
         "@babel/plugin-syntax-dynamic-import",
-        "@babel/plugin-transform-runtime"
-    ]
+        "@babel/plugin-transform-runtime",
+    ],
 };

From 35dbc82b87f5aba8b5ab91afa4a7afb6d0ab5a4a Mon Sep 17 00:00:00 2001
From: Will Hunt <will@half-shot.uk>
Date: Fri, 5 Mar 2021 15:01:48 +0000
Subject: [PATCH 166/420] Add issue comments

---
 src/components/structures/LoggedInView.tsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx
index 508b7f05e7..5acc8c6891 100644
--- a/src/components/structures/LoggedInView.tsx
+++ b/src/components/structures/LoggedInView.tsx
@@ -93,6 +93,8 @@ interface IProps {
 }
 
 interface IUsageLimit {
+    // "hs_disabled" is NOT a specced string, but is used in Synapse
+    // This is tracked over at https://github.com/matrix-org/synapse/issues/9237
     // eslint-disable-next-line camelcase
     limit_type: "monthly_active_user" | "hs_disabled" | string;
     // eslint-disable-next-line camelcase
@@ -102,6 +104,8 @@ interface IUsageLimit {
 interface IState {
     syncErrorData?: {
         error: {
+            // This is not specced, but used in Synapse. See
+            // https://github.com/matrix-org/synapse/issues/9237#issuecomment-768238922
             data: IUsageLimit;
             errcode: string;
         };

From e5b03488d890a3c289cd06d0e2ab8dd11bbb77ce Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 5 Mar 2021 17:52:51 +0000
Subject: [PATCH 167/420] Fix widget resizing

There was a line of CSS that set pointer-events: none on widget
iframes whilst they were being resized to stop iframes swallowing
the mousemove/up events while dragging the resize handle, but a)
all widgets are now in a persisted element wrapper and therefore
not in the right place in the DOM to get that CSS and b) that only
got set when resizing the whole aps drawer vertically, not dragging
the handle between apps to change the width distribution.

Add a pointer events prop to AppTile to allow the pointer-events
style to be set by the parent, and set it when dragging either
resize handle.

Fixes https://github.com/vector-im/element-web/issues/16473
---
 res/css/views/rooms/_AppsDrawer.scss     |  5 -----
 src/components/views/elements/AppTile.js | 14 ++++++++++----
 src/components/views/rooms/AppsDrawer.js | 14 +++++++++++++-
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/res/css/views/rooms/_AppsDrawer.scss b/res/css/views/rooms/_AppsDrawer.scss
index 492ed95973..fd80836237 100644
--- a/res/css/views/rooms/_AppsDrawer.scss
+++ b/res/css/views/rooms/_AppsDrawer.scss
@@ -370,11 +370,6 @@ $MinWidth: 240px;
     display: none;
 }
 
-/* Avoid apptile iframes capturing mouse event focus when resizing */
-.mx_AppsDrawer_resizing iframe {
-    pointer-events: none;
-}
-
 .mx_AppsDrawer_resizing .mx_AppTile_persistedWrapper {
     z-index: 1;
 }
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 213351889f..747d00a8df 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -328,6 +328,10 @@ export default class AppTile extends React.Component {
         const iframeFeatures = "microphone; camera; encrypted-media; autoplay; display-capture;";
 
         const appTileBodyClass = 'mx_AppTileBody' + (this.props.miniMode ? '_mini  ' : ' ');
+        const appTileBodyStyles = {};
+        if (this.props.pointerEvents) {
+            appTileBodyStyles['pointer-events'] = this.props.pointerEvents;
+        }
 
         const loadingElement = (
             <div className="mx_AppLoading_spinner_fadeIn">
@@ -338,7 +342,7 @@ export default class AppTile extends React.Component {
             // only possible for room widgets, can assert this.props.room here
             const isEncrypted = MatrixClientPeg.get().isRoomEncrypted(this.props.room.roomId);
             appTileBody = (
-                <div className={appTileBodyClass}>
+                <div className={appTileBodyClass} style={appTileBodyStyles}>
                     <AppPermission
                         roomId={this.props.room.roomId}
                         creatorUserId={this.props.creatorUserId}
@@ -350,20 +354,20 @@ export default class AppTile extends React.Component {
             );
         } else if (this.state.initialising) {
             appTileBody = (
-                <div className={appTileBodyClass + (this.state.loading ? 'mx_AppLoading' : '')}>
+                <div className={appTileBodyClass + (this.state.loading ? 'mx_AppLoading' : '')} style={appTileBodyStyles}>
                     { loadingElement }
                 </div>
             );
         } else {
             if (this.isMixedContent()) {
                 appTileBody = (
-                    <div className={appTileBodyClass}>
+                    <div className={appTileBodyClass} style={appTileBodyStyles}>
                         <AppWarning errorMsg="Error - Mixed content" />
                     </div>
                 );
             } else {
                 appTileBody = (
-                    <div className={appTileBodyClass + (this.state.loading ? 'mx_AppLoading' : '')}>
+                    <div className={appTileBodyClass + (this.state.loading ? 'mx_AppLoading' : '')} style={appTileBodyStyles}>
                         { this.state.loading && loadingElement }
                         <iframe
                             allow={iframeFeatures}
@@ -477,6 +481,8 @@ AppTile.propTypes = {
     showPopout: PropTypes.bool,
     // Is this an instance of a user widget
     userWidget: PropTypes.bool,
+    // sets the pointer-events property on the iframe
+    pointerEvents: PropTypes.string,
 };
 
 AppTile.defaultProps = {
diff --git a/src/components/views/rooms/AppsDrawer.js b/src/components/views/rooms/AppsDrawer.js
index ef30e4a8f5..aa7120bbe6 100644
--- a/src/components/views/rooms/AppsDrawer.js
+++ b/src/components/views/rooms/AppsDrawer.js
@@ -53,6 +53,8 @@ export default class AppsDrawer extends React.Component {
 
         this.state = {
             apps: this._getApps(),
+            resizingVertical: false, // true when changing the height of the apps drawer
+            resizingHorizontal: false, // true when chagning the distribution of the width between widgets
         };
 
         this._resizeContainer = null;
@@ -85,13 +87,16 @@ export default class AppsDrawer extends React.Component {
     }
 
     onIsResizing = (resizing) => {
-        this.setState({ resizing });
+        // This one is the vertical, ie. change height of apps drawer
+        this.setState({ resizingVertical: resizing });
         if (!resizing) {
             this._relaxResizer();
         }
     };
 
     _createResizer() {
+        // This is the horizontal one, changing the distribution of the width between the app tiles
+        // (ie. a vertical resize handle because, the handle itself is vertical...)
         const classNames = {
             handle: "mx_ResizeHandle",
             vertical: "mx_ResizeHandle_vertical",
@@ -100,6 +105,7 @@ export default class AppsDrawer extends React.Component {
         const collapseConfig = {
             onResizeStart: () => {
                 this._resizeContainer.classList.add("mx_AppsDrawer_resizing");
+                this.setState({ resizingHorizontal: true });
             },
             onResizeStop: () => {
                 this._resizeContainer.classList.remove("mx_AppsDrawer_resizing");
@@ -107,6 +113,7 @@ export default class AppsDrawer extends React.Component {
                     this.props.room, Container.Top,
                     this.state.apps.slice(1).map((_, i) => this.resizer.forHandleAt(i).size),
                 );
+                this.setState({ resizingHorizontal: false });
             },
         };
         // pass a truthy container for now, we won't call attach until we update it
@@ -162,6 +169,10 @@ export default class AppsDrawer extends React.Component {
         }
     };
 
+    isResizing() {
+        return this.state.resizingVertical || this.state.resizingHorizontal;
+    }
+
     onAction = (action) => {
         const hideWidgetKey = this.props.room.roomId + '_hide_widget_drawer';
         switch (action.action) {
@@ -209,6 +220,7 @@ export default class AppsDrawer extends React.Component {
                 creatorUserId={app.creatorUserId}
                 widgetPageTitle={WidgetUtils.getWidgetDataTitle(app)}
                 waitForIframeLoad={app.waitForIframeLoad}
+                pointerEvents={this.isResizing() ? 'none' : undefined}
             />);
         });
 

From ca63e937d396387254c91d225735b288cc2c6701 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 5 Mar 2021 10:56:13 -0700
Subject: [PATCH 168/420] Fix up logic to show sent receipts correctly

---
 src/components/structures/MessagePanel.js | 10 ++++++++
 src/components/views/rooms/EventTile.js   | 29 +++++++++++++----------
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 161227a139..dab1c953a9 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -595,6 +595,15 @@ export default class MessagePanel extends React.Component {
 
         const readReceipts = this._readReceiptsByEvent[eventId];
 
+        let isLastSuccessful = false;
+        const isSentState = s => !s || s === 'sent';
+        const isSent = isSentState(mxEv.getAssociatedStatus())
+        if (!nextEvent && isSent) {
+            isLastSuccessful = true;
+        } else if (nextEvent && isSent && !isSentState(nextEvent.getAssociatedStatus())) {
+            isLastSuccessful = true;
+        }
+
         // use txnId as key if available so that we don't remount during sending
         ret.push(
             <li
@@ -620,6 +629,7 @@ export default class MessagePanel extends React.Component {
                         permalinkCreator={this.props.permalinkCreator}
                         last={last}
                         lastInSection={willWantDateSeparator}
+                        lastSuccessful={isLastSuccessful}
                         isSelectedEvent={highlight}
                         getRelationsForEvent={this.props.getRelationsForEvent}
                         showReactions={this.props.showReactions}
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index b4192fc8d3..52010c8c2e 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -171,6 +171,9 @@ export default class EventTile extends React.Component {
         // targeting)
         lastInSection: PropTypes.bool,
 
+        // True if the event is the last successful (sent) event.
+        isLastSuccessful: PropTypes.bool,
+
         /* true if this is search context (which has the effect of greying out
          * the text
          */
@@ -297,7 +300,11 @@ export default class EventTile extends React.Component {
         // events and pretty much anything that can't be sent by the composer as a message. For
         // those we rely on local echo giving the impression of things changing, and expect them
         // to be quick.
-        const simpleSendableEvents = [EventType.Sticker, EventType.RoomMessage, EventType.RoomMessageEncrypted];
+        const simpleSendableEvents = [
+            EventType.Sticker,
+            EventType.RoomMessage,
+            EventType.RoomMessageEncrypted,
+        ];
         if (!simpleSendableEvents.includes(this.props.mxEvent.getType())) return false;
 
         // Default case
@@ -308,22 +315,20 @@ export default class EventTile extends React.Component {
         // If we're not even eligible, don't show the receipt.
         if (!this._isEligibleForSpecialReceipt) return false;
 
+        // We only show the 'sent' receipt on the last successful event.
+        if (!this.props.lastSuccessful) return false;
+
         // Check to make sure the sending state is appropriate. A null/undefined send status means
         // that the message is 'sent', so we're just double checking that it's explicitly not sent.
         if (this.props.eventSendStatus && this.props.eventSendStatus !== 'sent') return false;
 
-        // No point in doing the complex math if we're not going to even show this special receipt.
-        if (this._shouldShowSendingReceipt) return false;
-
-        // Next we check to see if any newer events have read receipts. If they do then we don't
-        // show our special state - the user already has feedback about their message. We only
-        // search for the most recent 50 events because surely someone will have sent *something*
-        // in that time, even if it is a membership event or something.
-        const room = this.context.getRoom(this.props.mxEvent.getRoomId());
+        // If anyone has read the event besides us, we don't want to show a sent receipt.
+        const receipts = this.props.readReceipts || [];
         const myUserId = MatrixClientPeg.get().getUserId();
-        const readUsers = room.getUsersWhoHaveRead(this.props.mxEvent, 50);
-        const hasBeenRead = readUsers.length === 0 || readUsers.some(u => u !== myUserId);
-        return !hasBeenRead;
+        if (receipts.some(r => r.userId !== myUserId)) return false;
+
+        // Finally, we should show a receipt.
+        return true;
     }
 
     get _shouldShowSendingReceipt() {

From 2c64dac5140004e41623d3337d163a9ed1d0babb Mon Sep 17 00:00:00 2001
From: Panagiotis <27917356+panoschal@users.noreply.github.com>
Date: Fri, 5 Mar 2021 19:57:37 +0200
Subject: [PATCH 169/420] fix: show decrypted source on EditHistory ->
 ViewSource

pass correct props to the component
---
 src/components/views/messages/EditHistoryMessage.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/views/messages/EditHistoryMessage.js b/src/components/views/messages/EditHistoryMessage.js
index df27773a40..68a3c95745 100644
--- a/src/components/views/messages/EditHistoryMessage.js
+++ b/src/components/views/messages/EditHistoryMessage.js
@@ -77,6 +77,8 @@ export default class EditHistoryMessage extends React.PureComponent {
             roomId: this.props.mxEvent.getRoomId(),
             eventId: this.props.mxEvent.getId(),
             content: this.props.mxEvent.event,
+            isEncrypted: this.props.mxEvent.getType() !== this.props.mxEvent.getWireType(),
+            decryptedContent: this.props.mxEvent._clearEvent,
         }, 'mx_Dialog_viewsource');
     };
 

From f87f2b11ef945d7d78e8912e6df9b75514f10764 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 5 Mar 2021 11:05:56 -0700
Subject: [PATCH 170/420] Appease the linter

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

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index dab1c953a9..c1ccf61470 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -597,7 +597,7 @@ export default class MessagePanel extends React.Component {
 
         let isLastSuccessful = false;
         const isSentState = s => !s || s === 'sent';
-        const isSent = isSentState(mxEv.getAssociatedStatus())
+        const isSent = isSentState(mxEv.getAssociatedStatus());
         if (!nextEvent && isSent) {
             isLastSuccessful = true;
         } else if (nextEvent && isSent && !isSentState(nextEvent.getAssociatedStatus())) {

From ae9618367eef5a4c6a429f101ee5f1b424c50d1d Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 5 Mar 2021 13:06:53 -0700
Subject: [PATCH 171/420] Convert UploadBar to TypeScript

---
 .../{UploadBar.js => UploadBar.tsx}           | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)
 rename src/components/structures/{UploadBar.js => UploadBar.tsx} (90%)

diff --git a/src/components/structures/UploadBar.js b/src/components/structures/UploadBar.tsx
similarity index 90%
rename from src/components/structures/UploadBar.js
rename to src/components/structures/UploadBar.tsx
index 16cc4cb987..27d6746698 100644
--- a/src/components/structures/UploadBar.js
+++ b/src/components/structures/UploadBar.tsx
@@ -1,6 +1,5 @@
 /*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2015, 2016, 2019, 2021 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -16,16 +15,22 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
 import ContentMessages from '../../ContentMessages';
 import dis from "../../dispatcher/dispatcher";
 import filesize from "filesize";
 import { _t } from '../../languageHandler';
+import {Room} from "matrix-js-sdk/src/models/room";
 
-export default class UploadBar extends React.Component {
-    static propTypes = {
-        room: PropTypes.object,
-    };
+interface IProps {
+    room: Room;
+}
+
+interface IState {
+}
+
+export default class UploadBar extends React.Component<IProps, IState> {
+    private dispatcherRef: string;
+    private mounted: boolean;
 
     componentDidMount() {
         this.dispatcherRef = dis.register(this.onAction);
@@ -37,7 +42,7 @@ export default class UploadBar extends React.Component {
         dis.unregister(this.dispatcherRef);
     }
 
-    onAction = payload => {
+    private onAction = (payload) => {
         switch (payload.action) {
             case 'upload_progress':
             case 'upload_finished':

From bb80cfb9a66fd26af9571b8be3c0979d3cb944a6 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 5 Mar 2021 13:20:50 -0700
Subject: [PATCH 172/420] Convert all of file uploads to the new dispatcher

---
 src/ContentMessages.tsx                  | 27 ++++++-------
 src/components/structures/RoomView.tsx   |  6 +--
 src/components/structures/UploadBar.tsx  | 12 +++---
 src/dispatcher/actions.ts                | 25 ++++++++++++
 src/dispatcher/payloads/UploadPayload.ts | 51 ++++++++++++++++++++++++
 src/models/IUpload.ts                    | 24 +++++++++++
 6 files changed, 123 insertions(+), 22 deletions(-)
 create mode 100644 src/dispatcher/payloads/UploadPayload.ts
 create mode 100644 src/models/IUpload.ts

diff --git a/src/ContentMessages.tsx b/src/ContentMessages.tsx
index bec36d49f6..95b45cce4a 100644
--- a/src/ContentMessages.tsx
+++ b/src/ContentMessages.tsx
@@ -32,6 +32,14 @@ import Spinner from "./components/views/elements/Spinner";
 import "blueimp-canvas-to-blob";
 import { Action } from "./dispatcher/actions";
 import CountlyAnalytics from "./CountlyAnalytics";
+import {
+    UploadCanceledPayload,
+    UploadErrorPayload,
+    UploadFinishedPayload,
+    UploadProgressPayload,
+    UploadStartedPayload,
+} from "./dispatcher/payloads/UploadPayload";
+import {IUpload} from "./models/IUpload";
 
 const MAX_WIDTH = 800;
 const MAX_HEIGHT = 600;
@@ -44,15 +52,6 @@ export class UploadCanceledError extends Error {}
 
 type ThumbnailableElement = HTMLImageElement | HTMLVideoElement;
 
-interface IUpload {
-    fileName: string;
-    roomId: string;
-    total: number;
-    loaded: number;
-    promise: Promise<any>;
-    canceled?: boolean;
-}
-
 interface IMediaConfig {
     "m.upload.size"?: number;
 }
@@ -478,7 +477,7 @@ export default class ContentMessages {
         if (upload) {
             upload.canceled = true;
             MatrixClientPeg.get().cancelUpload(upload.promise);
-            dis.dispatch({action: 'upload_canceled', upload});
+            dis.dispatch<UploadCanceledPayload>({action: Action.UploadCanceled, upload});
         }
     }
 
@@ -539,7 +538,7 @@ export default class ContentMessages {
             promise: prom,
         };
         this.inprogress.push(upload);
-        dis.dispatch({action: 'upload_started'});
+        dis.dispatch<UploadStartedPayload>({action: Action.UploadStarted, upload});
 
         // Focus the composer view
         dis.fire(Action.FocusComposer);
@@ -547,7 +546,7 @@ export default class ContentMessages {
         function onProgress(ev) {
             upload.total = ev.total;
             upload.loaded = ev.loaded;
-            dis.dispatch({action: 'upload_progress', upload: upload});
+            dis.dispatch<UploadProgressPayload>({action: Action.UploadProgress, upload});
         }
 
         let error;
@@ -601,9 +600,9 @@ export default class ContentMessages {
                 if (error && error.http_status === 413) {
                     this.mediaConfig = null;
                 }
-                dis.dispatch({action: 'upload_failed', upload, error});
+                dis.dispatch<UploadErrorPayload>({action: Action.UploadFailed, upload, error});
             } else {
-                dis.dispatch({action: 'upload_finished', upload});
+                dis.dispatch<UploadFinishedPayload>({action: Action.UploadFinished, upload});
                 dis.dispatch({action: 'message_sent'});
             }
         });
diff --git a/src/components/structures/RoomView.tsx b/src/components/structures/RoomView.tsx
index 96808e651e..90f6daf6cb 100644
--- a/src/components/structures/RoomView.tsx
+++ b/src/components/structures/RoomView.tsx
@@ -711,9 +711,9 @@ export default class RoomView extends React.Component<IProps, IState> {
                     [payload.file], this.state.room.roomId, this.context);
                 break;
             case 'notifier_enabled':
-            case 'upload_started':
-            case 'upload_finished':
-            case 'upload_canceled':
+            case Action.UploadStarted:
+            case Action.UploadFinished:
+            case Action.UploadCanceled:
                 this.forceUpdate();
                 break;
             case 'call_state': {
diff --git a/src/components/structures/UploadBar.tsx b/src/components/structures/UploadBar.tsx
index 27d6746698..f60e28b333 100644
--- a/src/components/structures/UploadBar.tsx
+++ b/src/components/structures/UploadBar.tsx
@@ -20,6 +20,8 @@ import dis from "../../dispatcher/dispatcher";
 import filesize from "filesize";
 import { _t } from '../../languageHandler';
 import {Room} from "matrix-js-sdk/src/models/room";
+import {ActionPayload} from "../../dispatcher/payloads";
+import {Action} from "../../dispatcher/actions";
 
 interface IProps {
     room: Room;
@@ -42,12 +44,12 @@ export default class UploadBar extends React.Component<IProps, IState> {
         dis.unregister(this.dispatcherRef);
     }
 
-    private onAction = (payload) => {
+    private onAction = (payload: ActionPayload) => {
         switch (payload.action) {
-            case 'upload_progress':
-            case 'upload_finished':
-            case 'upload_canceled':
-            case 'upload_failed':
+            case Action.UploadProgress:
+            case Action.UploadFinished:
+            case Action.UploadCanceled:
+            case Action.UploadFailed:
                 if (this.mounted) this.forceUpdate();
                 break;
         }
diff --git a/src/dispatcher/actions.ts b/src/dispatcher/actions.ts
index 12bf4c57a3..cd32c3743f 100644
--- a/src/dispatcher/actions.ts
+++ b/src/dispatcher/actions.ts
@@ -113,4 +113,29 @@ export enum Action {
      * XXX: Ditto
      */
     VirtualRoomSupportUpdated = "virtual_room_support_updated",
+
+    /**
+     * Fired when an upload has started. Should be used with UploadStartedPayload.
+     */
+    UploadStarted = "upload_started",
+
+    /**
+     * Fired when an upload makes progress. Should be used with UploadProgressPayload.
+     */
+    UploadProgress = "upload_progress",
+
+    /**
+     * Fired when an upload is completed. Should be used with UploadFinishedPayload.
+     */
+    UploadFinished = "upload_finished",
+
+    /**
+     * Fired when an upload fails. Should be used with UploadErrorPayload.
+     */
+    UploadFailed = "upload_failed",
+
+    /**
+     * Fired when an upload is cancelled by the user. Should be used with UploadCanceledPayload.
+     */
+    UploadCanceled = "upload_canceled",
 }
diff --git a/src/dispatcher/payloads/UploadPayload.ts b/src/dispatcher/payloads/UploadPayload.ts
new file mode 100644
index 0000000000..40c2710dd6
--- /dev/null
+++ b/src/dispatcher/payloads/UploadPayload.ts
@@ -0,0 +1,51 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { ActionPayload } from "../payloads";
+import { Action } from "../actions";
+import {IUpload} from "../../models/IUpload";
+
+interface UploadPayload extends ActionPayload {
+    /**
+     * The upload with fields representing the new upload state.
+     */
+    upload: IUpload;
+}
+
+export interface UploadStartedPayload extends UploadPayload {
+    action: Action.UploadStarted;
+}
+
+export interface UploadProgressPayload extends UploadPayload {
+    action: Action.UploadProgress;
+}
+
+export interface UploadErrorPayload extends UploadPayload {
+    action: Action.UploadFailed;
+
+    /**
+     * An error to describe what went wrong with the upload.
+     */
+    error: Error;
+}
+
+export interface UploadFinishedPayload extends UploadPayload {
+    action: Action.UploadFinished;
+}
+
+export interface UploadCanceledPayload extends UploadPayload {
+    action: Action.UploadCanceled;
+}
diff --git a/src/models/IUpload.ts b/src/models/IUpload.ts
new file mode 100644
index 0000000000..5b376e9330
--- /dev/null
+++ b/src/models/IUpload.ts
@@ -0,0 +1,24 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.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 interface IUpload {
+    fileName: string;
+    roomId: string;
+    total: number;
+    loaded: number;
+    promise: Promise<any>;
+    canceled?: boolean;
+}

From 711181cc695dabca5c46578a514b6dae97dd55da Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 5 Mar 2021 14:14:43 -0700
Subject: [PATCH 173/420] Rough style for new upload bar

This repurposes ProgressBar which was not used anywhere in code.
---
 res/css/_common.scss                          |  7 +++
 res/css/structures/_UploadBar.scss            | 26 +++--------
 res/css/views/elements/_ProgressBar.scss      | 13 +++---
 res/themes/dark/css/_dark.scss                |  3 ++
 res/themes/legacy-dark/css/_legacy-dark.scss  |  3 ++
 .../legacy-light/css/_legacy-light.scss       |  3 +-
 res/themes/light/css/_light.scss              |  3 +-
 src/components/structures/UploadBar.tsx       | 44 ++++++-------------
 8 files changed, 42 insertions(+), 60 deletions(-)

diff --git a/res/css/_common.scss b/res/css/_common.scss
index 6e9d252659..8ae1cc6641 100644
--- a/res/css/_common.scss
+++ b/res/css/_common.scss
@@ -606,6 +606,13 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
     }
 }
 
+@define-mixin ProgressBarBgColour $colour {
+    background-color: $colour;
+    &::-webkit-progress-bar {
+        background-color: $colour;
+    }
+}
+
 @define-mixin ProgressBarBorderRadius $radius {
     border-radius: $radius;
     &::-moz-progress-bar {
diff --git a/res/css/structures/_UploadBar.scss b/res/css/structures/_UploadBar.scss
index d76c81668c..ce884e27a9 100644
--- a/res/css/structures/_UploadBar.scss
+++ b/res/css/structures/_UploadBar.scss
@@ -1,5 +1,5 @@
 /*
-Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2015, 2016, 2021 The Matrix.org Foundation C.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,24 +15,15 @@ limitations under the License.
 */
 
 .mx_UploadBar {
-    position: relative;
-}
+    padding-left: 65px; // line up with the shield area in the composer
 
-.mx_UploadBar_uploadProgressOuter {
-    height: 5px;
-    margin-left: 63px;
-    margin-top: -1px;
-    padding-bottom: 5px;
-}
-
-.mx_UploadBar_uploadProgressInner {
-    background-color: $accent-color;
-    height: 5px;
+    .mx_ProgressBar {
+        width: calc(100% - 40px); // cheating at a right margin
+    }
 }
 
 .mx_UploadBar_uploadFilename {
     margin-top: 5px;
-    margin-left: 65px;
     opacity: 0.5;
     color: $primary-fg-color;
 }
@@ -52,10 +43,3 @@ limitations under the License.
     cursor: pointer;
     z-index: 1;
 }
-
-.mx_UploadBar_uploadBytes {
-    float: right;
-    margin-top: 5px;
-    margin-right: 30px;
-    color: $accent-color;
-}
diff --git a/res/css/views/elements/_ProgressBar.scss b/res/css/views/elements/_ProgressBar.scss
index e49d85af04..5598ddba20 100644
--- a/res/css/views/elements/_ProgressBar.scss
+++ b/res/css/views/elements/_ProgressBar.scss
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Matrix.org Foundation C.I.C.
+Copyright 2020, 2021 The Matrix.org Foundation C.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,15 +15,16 @@ limitations under the License.
 */
 
 progress.mx_ProgressBar {
-    height: 4px;
+    height: 6px;
     width: 60px;
-    border-radius: 10px;
+    border-radius: 6px;
     overflow: hidden;
     appearance: none;
-    border: 0;
+    border: none;
 
-    @mixin ProgressBarBorderRadius "10px";
-    @mixin ProgressBarColour $accent-color;
+    @mixin ProgressBarBorderRadius "6px";
+    @mixin ProgressBarColour $progressbar-fg-color;
+    @mixin ProgressBarBgColour $progressbar-bg-color;
     ::-webkit-progress-value {
         transition: width 1s;
     }
diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss
index 0de5e69782..4b8c17fc78 100644
--- a/res/themes/dark/css/_dark.scss
+++ b/res/themes/dark/css/_dark.scss
@@ -173,6 +173,9 @@ $button-link-bg-color: transparent;
 // Toggle switch
 $togglesw-off-color: $room-highlight-color;
 
+$progressbar-fg-color: $accent-color;
+$progressbar-bg-color: #21262c;
+
 $visual-bell-bg-color: #800;
 
 $room-warning-bg-color: $header-panel-bg-color;
diff --git a/res/themes/legacy-dark/css/_legacy-dark.scss b/res/themes/legacy-dark/css/_legacy-dark.scss
index 8c5f20178b..892f63a2c7 100644
--- a/res/themes/legacy-dark/css/_legacy-dark.scss
+++ b/res/themes/legacy-dark/css/_legacy-dark.scss
@@ -168,6 +168,9 @@ $button-link-bg-color: transparent;
 // Toggle switch
 $togglesw-off-color: $room-highlight-color;
 
+$progressbar-fg-color: $accent-color;
+$progressbar-bg-color: #21262c;
+
 $visual-bell-bg-color: #800;
 
 $room-warning-bg-color: $header-panel-bg-color;
diff --git a/res/themes/legacy-light/css/_legacy-light.scss b/res/themes/legacy-light/css/_legacy-light.scss
index 3ba10a68ea..28e8ed9ea1 100644
--- a/res/themes/legacy-light/css/_legacy-light.scss
+++ b/res/themes/legacy-light/css/_legacy-light.scss
@@ -282,7 +282,8 @@ $togglesw-ball-color: #fff;
 $slider-selection-color: $accent-color;
 $slider-background-color: #c1c9d6;
 
-$progressbar-color: #000;
+$progressbar-fg-color: $accent-color;
+$progressbar-bg-color: rgba(141, 151, 165, 0.2);
 
 $room-warning-bg-color: $yellow-background;
 
diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss
index b6906d16be..b118062e30 100644
--- a/res/themes/light/css/_light.scss
+++ b/res/themes/light/css/_light.scss
@@ -279,7 +279,8 @@ $togglesw-ball-color: #fff;
 $slider-selection-color: $accent-color;
 $slider-background-color: #c1c9d6;
 
-$progressbar-color: #000;
+$progressbar-fg-color: $accent-color;
+$progressbar-bg-color: rgba(141, 151, 165, 0.2);
 
 $room-warning-bg-color: $yellow-background;
 
diff --git a/src/components/structures/UploadBar.tsx b/src/components/structures/UploadBar.tsx
index f60e28b333..3933ef0f9e 100644
--- a/src/components/structures/UploadBar.tsx
+++ b/src/components/structures/UploadBar.tsx
@@ -22,6 +22,7 @@ import { _t } from '../../languageHandler';
 import {Room} from "matrix-js-sdk/src/models/room";
 import {ActionPayload} from "../../dispatcher/payloads";
 import {Action} from "../../dispatcher/actions";
+import ProgressBar from "../views/elements/ProgressBar";
 
 interface IProps {
     room: Room;
@@ -68,48 +69,29 @@ export default class UploadBar extends React.Component<IProps, IState> {
         //     fileName: "testing_fooble.jpg",
         // }];
 
-        if (uploads.length == 0) {
-            return <div />;
+        const uploadsHere = uploads.filter(u => u.roomId === this.props.room.roomId);
+        if (uploadsHere.length == 0) {
+            return null;
         }
 
-        let upload;
-        for (let i = 0; i < uploads.length; ++i) {
-            if (uploads[i].roomId == this.props.room.roomId) {
-                upload = uploads[i];
-                break;
-            }
-        }
-        if (!upload) {
-            return <div />;
-        }
-
-        const innerProgressStyle = {
-            width: ((upload.loaded / (upload.total || 1)) * 100) + '%',
-        };
-        let uploadedSize = filesize(upload.loaded);
-        const totalSize = filesize(upload.total);
-        if (uploadedSize.replace(/^.* /, '') === totalSize.replace(/^.* /, '')) {
-            uploadedSize = uploadedSize.replace(/ .*/, '');
-        }
+        const currentUpload = uploadsHere[0];
+        const uploadSize = filesize(currentUpload.total);
 
         // MUST use var name 'count' for pluralization to kick in
         const uploadText = _t(
-            "Uploading %(filename)s and %(count)s others", {filename: upload.fileName, count: (uploads.length - 1)},
+            "Uploading %(filename)s and %(count)s others", {
+                filename: currentUpload.fileName,
+                count: uploadsHere.length - 1,
+            },
         );
 
         return (
             <div className="mx_UploadBar">
-                <div className="mx_UploadBar_uploadProgressOuter">
-                    <div className="mx_UploadBar_uploadProgressInner" style={innerProgressStyle}></div>
-                </div>
-                <img className="mx_UploadBar_uploadIcon mx_filterFlipColor" src={require("../../../res/img/fileicon.png")} width="17" height="22" />
                 <img className="mx_UploadBar_uploadCancel mx_filterFlipColor" src={require("../../../res/img/cancel.svg")} width="18" height="18"
-                    onClick={function() { ContentMessages.sharedInstance().cancelUpload(upload.promise); }}
+                    onClick={function() { ContentMessages.sharedInstance().cancelUpload(currentUpload.promise); }}
                 />
-                <div className="mx_UploadBar_uploadBytes">
-                    { uploadedSize } / { totalSize }
-                </div>
-                <div className="mx_UploadBar_uploadFilename">{ uploadText }</div>
+                <div className="mx_UploadBar_uploadFilename">{uploadText} ({uploadSize})</div>
+                <ProgressBar value={currentUpload.loaded} max={currentUpload.total} />
             </div>
         );
     }

From fa41489d5ae343c999f8788cce495107db94a394 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 5 Mar 2021 14:24:02 -0700
Subject: [PATCH 174/420] Refactor UploadBar into component state

---
 src/components/structures/UploadBar.tsx | 54 +++++++++++++------------
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/src/components/structures/UploadBar.tsx b/src/components/structures/UploadBar.tsx
index 3933ef0f9e..509b8c8363 100644
--- a/src/components/structures/UploadBar.tsx
+++ b/src/components/structures/UploadBar.tsx
@@ -23,18 +23,27 @@ import {Room} from "matrix-js-sdk/src/models/room";
 import {ActionPayload} from "../../dispatcher/payloads";
 import {Action} from "../../dispatcher/actions";
 import ProgressBar from "../views/elements/ProgressBar";
+import AccessibleButton from "../views/elements/AccessibleButton";
+import {IUpload} from "../../models/IUpload";
 
 interface IProps {
     room: Room;
 }
 
 interface IState {
+    currentUpload?: IUpload;
+    uploadsHere: IUpload[];
 }
 
 export default class UploadBar extends React.Component<IProps, IState> {
     private dispatcherRef: string;
     private mounted: boolean;
 
+    constructor(props) {
+        super(props);
+        this.state = {uploadsHere: []};
+    }
+
     componentDidMount() {
         this.dispatcherRef = dis.register(this.onAction);
         this.mounted = true;
@@ -47,51 +56,44 @@ export default class UploadBar extends React.Component<IProps, IState> {
 
     private onAction = (payload: ActionPayload) => {
         switch (payload.action) {
+            case Action.UploadStarted:
             case Action.UploadProgress:
             case Action.UploadFinished:
             case Action.UploadCanceled:
-            case Action.UploadFailed:
-                if (this.mounted) this.forceUpdate();
+            case Action.UploadFailed: {
+                if (!this.mounted) return;
+                const uploads = ContentMessages.sharedInstance().getCurrentUploads();
+                const uploadsHere = uploads.filter(u => u.roomId === this.props.room.roomId);
+                this.setState({currentUpload: uploadsHere[0], uploadsHere});
                 break;
+            }
         }
     };
 
+    private onCancelClick = (ev) => {
+        ev.preventDefault();
+        ContentMessages.sharedInstance().cancelUpload(this.state.currentUpload.promise);
+    };
+
     render() {
-        const uploads = ContentMessages.sharedInstance().getCurrentUploads();
-
-        // for testing UI... - also fix up the ContentMessages.getCurrentUploads().length
-        // check in RoomView
-        //
-        // uploads = [{
-        //     roomId: this.props.room.roomId,
-        //     loaded: 123493,
-        //     total: 347534,
-        //     fileName: "testing_fooble.jpg",
-        // }];
-
-        const uploadsHere = uploads.filter(u => u.roomId === this.props.room.roomId);
-        if (uploadsHere.length == 0) {
+        if (!this.state.currentUpload) {
             return null;
         }
 
-        const currentUpload = uploadsHere[0];
-        const uploadSize = filesize(currentUpload.total);
-
         // MUST use var name 'count' for pluralization to kick in
         const uploadText = _t(
             "Uploading %(filename)s and %(count)s others", {
-                filename: currentUpload.fileName,
-                count: uploadsHere.length - 1,
+                filename: this.state.currentUpload.fileName,
+                count: this.state.uploadsHere.length - 1,
             },
         );
-
+        
+        const uploadSize = filesize(this.state.currentUpload.total);
         return (
             <div className="mx_UploadBar">
-                <img className="mx_UploadBar_uploadCancel mx_filterFlipColor" src={require("../../../res/img/cancel.svg")} width="18" height="18"
-                    onClick={function() { ContentMessages.sharedInstance().cancelUpload(currentUpload.promise); }}
-                />
+                <AccessibleButton onClick={this.onCancelClick} className='mx_UploadBar_cancel' />
                 <div className="mx_UploadBar_uploadFilename">{uploadText} ({uploadSize})</div>
-                <ProgressBar value={currentUpload.loaded} max={currentUpload.total} />
+                <ProgressBar value={this.state.currentUpload.loaded} max={this.state.currentUpload.total} />
             </div>
         );
     }

From 08072aca9aa35f0bcef03bcd4913299d9860157b Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 5 Mar 2021 14:42:15 -0700
Subject: [PATCH 175/420] Add upload icon, fix cancel button, refresh styles

---
 res/css/structures/_UploadBar.scss      | 50 ++++++++++++++++---------
 res/img/element-icons/upload.svg        |  4 ++
 src/components/structures/UploadBar.tsx |  4 +-
 3 files changed, 38 insertions(+), 20 deletions(-)
 create mode 100644 res/img/element-icons/upload.svg

diff --git a/res/css/structures/_UploadBar.scss b/res/css/structures/_UploadBar.scss
index ce884e27a9..7c62516b47 100644
--- a/res/css/structures/_UploadBar.scss
+++ b/res/css/structures/_UploadBar.scss
@@ -16,30 +16,44 @@ limitations under the License.
 
 .mx_UploadBar {
     padding-left: 65px; // line up with the shield area in the composer
+    position: relative;
 
     .mx_ProgressBar {
         width: calc(100% - 40px); // cheating at a right margin
     }
 }
 
-.mx_UploadBar_uploadFilename {
+.mx_UploadBar_filename {
     margin-top: 5px;
-    opacity: 0.5;
-    color: $primary-fg-color;
-}
-
-.mx_UploadBar_uploadIcon {
-    float: left;
-    margin-top: 5px;
-    margin-left: 14px;
-}
-
-.mx_UploadBar_uploadCancel {
-    float: right;
-    margin-top: 5px;
-    margin-right: 10px;
+    color: $muted-fg-color;
     position: relative;
-    opacity: 0.6;
-    cursor: pointer;
-    z-index: 1;
+    padding-left: 22px; // 18px for icon, 4px for padding
+    font-size: $font-15px;
+    vertical-align: middle;
+
+    &::before {
+        content: "";
+        height: 18px;
+        width: 18px;
+        position: absolute;
+        top: 0;
+        left: 0;
+        mask-repeat: no-repeat;
+        mask-position: center;
+        background-color: $muted-fg-color;
+        mask-image: url('$(res)/img/element-icons/upload.svg');
+    }
+}
+
+.mx_UploadBar_cancel {
+    position: absolute;
+    top: 0;
+    right: 0;
+    height: 16px;
+    width: 16px;
+    margin-right: 16px; // align over rightmost button in composer
+    mask-repeat: no-repeat;
+    mask-position: center;
+    background-color: $muted-fg-color;
+    mask-image: url('$(res)/img/icons-close.svg');
 }
diff --git a/res/img/element-icons/upload.svg b/res/img/element-icons/upload.svg
new file mode 100644
index 0000000000..71ad7ba1cf
--- /dev/null
+++ b/res/img/element-icons/upload.svg
@@ -0,0 +1,4 @@
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.99902 14L8.99902 4" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
+<path d="M12.5352 7.52441L8.99944 4.00012L5.46373 7.52441" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/components/structures/UploadBar.tsx b/src/components/structures/UploadBar.tsx
index 509b8c8363..44780c566f 100644
--- a/src/components/structures/UploadBar.tsx
+++ b/src/components/structures/UploadBar.tsx
@@ -87,12 +87,12 @@ export default class UploadBar extends React.Component<IProps, IState> {
                 count: this.state.uploadsHere.length - 1,
             },
         );
-        
+
         const uploadSize = filesize(this.state.currentUpload.total);
         return (
             <div className="mx_UploadBar">
+                <div className="mx_UploadBar_filename">{uploadText} ({uploadSize})</div>
                 <AccessibleButton onClick={this.onCancelClick} className='mx_UploadBar_cancel' />
-                <div className="mx_UploadBar_uploadFilename">{uploadText} ({uploadSize})</div>
                 <ProgressBar value={this.state.currentUpload.loaded} max={this.state.currentUpload.total} />
             </div>
         );

From 757597e55fc6a1a4911caa780425689f818d988c Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 5 Mar 2021 16:29:14 -0700
Subject: [PATCH 176/420] Fixed review concerns

---
 res/css/views/elements/_ProgressBar.scss | 1 -
 src/components/structures/UploadBar.tsx  | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/res/css/views/elements/_ProgressBar.scss b/res/css/views/elements/_ProgressBar.scss
index 5598ddba20..770978e921 100644
--- a/res/css/views/elements/_ProgressBar.scss
+++ b/res/css/views/elements/_ProgressBar.scss
@@ -17,7 +17,6 @@ limitations under the License.
 progress.mx_ProgressBar {
     height: 6px;
     width: 60px;
-    border-radius: 6px;
     overflow: hidden;
     appearance: none;
     border: none;
diff --git a/src/components/structures/UploadBar.tsx b/src/components/structures/UploadBar.tsx
index 44780c566f..b9d157ee00 100644
--- a/src/components/structures/UploadBar.tsx
+++ b/src/components/structures/UploadBar.tsx
@@ -15,16 +15,16 @@ limitations under the License.
 */
 
 import React from 'react';
+import { Room } from "matrix-js-sdk/src/models/room";
 import ContentMessages from '../../ContentMessages';
 import dis from "../../dispatcher/dispatcher";
 import filesize from "filesize";
 import { _t } from '../../languageHandler';
-import {Room} from "matrix-js-sdk/src/models/room";
-import {ActionPayload} from "../../dispatcher/payloads";
-import {Action} from "../../dispatcher/actions";
+import { ActionPayload } from "../../dispatcher/payloads";
+import { Action } from "../../dispatcher/actions";
 import ProgressBar from "../views/elements/ProgressBar";
 import AccessibleButton from "../views/elements/AccessibleButton";
-import {IUpload} from "../../models/IUpload";
+import { IUpload } from "../../models/IUpload";
 
 interface IProps {
     room: Room;

From 51ac5421c9848be775c977009454e7f55c79d155 Mon Sep 17 00:00:00 2001
From: Panagiotis <27917356+panoschal@users.noreply.github.com>
Date: Sat, 6 Mar 2021 11:30:31 +0200
Subject: [PATCH 177/420] chore: refactor code

pass only the mxEvent object to ViewSource
derive the necessary values inside the component
---
 src/components/structures/ViewSource.js       | 161 +++++++++---------
 .../views/context_menus/MessageContextMenu.js |   9 +-
 .../views/messages/EditHistoryMessage.js      |   6 +-
 3 files changed, 86 insertions(+), 90 deletions(-)

diff --git a/src/components/structures/ViewSource.js b/src/components/structures/ViewSource.js
index a31876ea76..369a0a1ddd 100644
--- a/src/components/structures/ViewSource.js
+++ b/src/components/structures/ViewSource.js
@@ -26,127 +26,134 @@ import { SendCustomEvent } from "../views/dialogs/DevtoolsDialog";
 
 export default class ViewSource extends React.Component {
     static propTypes = {
-        content: PropTypes.object.isRequired,
         onFinished: PropTypes.func.isRequired,
-        roomId: PropTypes.string.isRequired,
-        eventId: PropTypes.string.isRequired,
-        isEncrypted: PropTypes.bool.isRequired,
-        decryptedContent: PropTypes.object,
-        event: PropTypes.object.isRequired, // the MatrixEvent associated with the context menu
+        mxEvent: PropTypes.object.isRequired, // the MatrixEvent associated with the context menu
     };
 
     constructor(props) {
         super(props);
 
         this.state = {
-            editComponent: null,
+            isEditing: false,
         };
     }
 
     onBack() {
-        this.setState({ editComponent: null });
+        this.setState({ isEditing: false });
     }
 
-    editEvent() {
-        const isStateEvent = this.props.event.isState();
-        console.log("isStateEvent", isStateEvent);
-        if (isStateEvent) {
-            this.setState({
-                editComponent: (
-                    <MatrixClientContext.Consumer>
-                        {(cli) => (
-                            <SendCustomEvent
-                                room={cli.getRoom(this.props.roomId)}
-                                forceStateEvent={true}
-                                onBack={() => this.onBack()}
-                                inputs={{
-                                    eventType: this.props.event.getType(),
-                                    evContent: JSON.stringify(this.props.event.getContent(), null, "\t"),
-                                    stateKey: this.props.event.getStateKey(),
-                                }}
-                            />
-                        )}
-                    </MatrixClientContext.Consumer>
-                ),
-            });
-        } else {
-            // send an edit-message event
-            // prefill the "m.new_content" field
-            const originalContent = this.props.event.getContent();
-            const originalEventId = this.props.eventId;
-            const content = {
-                ...originalContent,
-                "m.new_content": originalContent,
-                "m.relates_to": {
-                    rel_type: "m.replace",
-                    event_id: originalEventId,
-                },
-            };
-            this.setState({
-                editComponent: (
-                    <MatrixClientContext.Consumer>
-                        {(cli) => (
-                            <SendCustomEvent
-                                room={cli.getRoom(this.props.roomId)}
-                                forceStateEvent={false}
-                                forceGeneralEvent={true}
-                                onBack={() => this.onBack()}
-                                inputs={{
-                                    eventType: this.props.event.getType(),
-                                    evContent: JSON.stringify(content, null, "\t"),
-                                }}
-                            />
-                        )}
-                    </MatrixClientContext.Consumer>
-                ),
-            });
-        }
+    onEdit() {
+        this.setState({ isEditing: true });
     }
 
-    render() {
-        const BaseDialog = sdk.getComponent("views.dialogs.BaseDialog");
+    // returns the dialog body for viewing the event source
+    viewSourceContent() {
+        const mxEvent = this.props.mxEvent.replacingEvent() || this.props.mxEvent; // show the replacing event, not the original, if it is an edit
+        const isEncrypted = this.props.mxEvent.getType() !== this.props.mxEvent.getWireType();
+        const decryptedEventSource = mxEvent._clearEvent; // FIXME: _clearEvent is private
+        const originalEventSource = mxEvent.event;
 
-        let content;
-        if (this.props.isEncrypted) {
-            content = (
+        if (isEncrypted) {
+            return (
                 <>
                     <details open className="mx_ViewSource_details">
                         <summary>
                             <span className="mx_ViewSource_heading">{_t("Decrypted event source")}</span>
                         </summary>
-                        <SyntaxHighlight className="json">{JSON.stringify(this.props.decryptedContent, null, 2)}</SyntaxHighlight>
+                        <SyntaxHighlight className="json">{JSON.stringify(decryptedEventSource, null, 2)}</SyntaxHighlight>
                     </details>
                     <details className="mx_ViewSource_details">
                         <summary>
                             <span className="mx_ViewSource_heading">{_t("Original event source")}</span>
                         </summary>
-                        <SyntaxHighlight className="json">{JSON.stringify(this.props.content, null, 2)}</SyntaxHighlight>
+                        <SyntaxHighlight className="json">{JSON.stringify(originalEventSource, null, 2)}</SyntaxHighlight>
                     </details>
                 </>
             );
         } else {
-            content = (
+            return (
                 <>
                     <div className="mx_ViewSource_heading">{_t("Original event source")}</div>
-                    <SyntaxHighlight className="json">{JSON.stringify(this.props.content, null, 2)}</SyntaxHighlight>
+                    <SyntaxHighlight className="json">{JSON.stringify(originalEventSource, null, 2)}</SyntaxHighlight>
                 </>
             );
         }
+    }
 
-        const isEditing = this.state.editComponent !== null;
-        console.log(isEditing);
+    // returns the SendCustomEvent component prefilled with the correct details
+    editSourceContent() {
+        const mxEvent = this.props.mxEvent.replacingEvent() || this.props.mxEvent; // show the replacing event, not the original, if it is an edit
 
+        const isStateEvent = mxEvent.isState();
+        console.log("isStateEvent", isStateEvent);
+        const roomId = mxEvent.getRoomId();
+        const eventId = mxEvent.getId();
+        const originalContent = mxEvent.getContent();
+        if (isStateEvent) {
+            return (
+                <MatrixClientContext.Consumer>
+                    {(cli) => (
+                        <SendCustomEvent
+                            room={cli.getRoom(roomId)}
+                            forceStateEvent={true}
+                            onBack={() => this.onBack()}
+                            inputs={{
+                                eventType: mxEvent.getType(),
+                                evContent: JSON.stringify(originalContent, null, "\t"),
+                                stateKey: mxEvent.getStateKey(),
+                            }}
+                        />
+                    )}
+                </MatrixClientContext.Consumer>
+            );
+        } else {
+            // send an edit-message event
+            // prefill the "m.new_content" field
+            const newContent = {
+                ...originalContent,
+                "m.new_content": originalContent,
+                "m.relates_to": {
+                    rel_type: "m.replace",
+                    event_id: eventId,
+                },
+            };
+            return (
+                <MatrixClientContext.Consumer>
+                    {(cli) => (
+                        <SendCustomEvent
+                            room={cli.getRoom(roomId)}
+                            forceStateEvent={false}
+                            forceGeneralEvent={true}
+                            onBack={() => this.onBack()}
+                            inputs={{
+                                eventType: mxEvent.getType(),
+                                evContent: JSON.stringify(newContent, null, "\t"),
+                            }}
+                        />
+                    )}
+                </MatrixClientContext.Consumer>
+            );
+        }
+    }
+
+    render() {
+        const BaseDialog = sdk.getComponent("views.dialogs.BaseDialog");
+        const mxEvent = this.props.mxEvent.replacingEvent() || this.props.mxEvent; // show the replacing event, not the original, if it is an edit
+
+        const isEditing = this.state.isEditing;
+        const roomId = mxEvent.getRoomId();
+        const eventId = mxEvent.getId();
         return (
             <BaseDialog className="mx_ViewSource" onFinished={this.props.onFinished} title={_t("View Source")}>
                 <div>
-                    <div className="mx_ViewSource_label_left">Room ID: {this.props.roomId}</div>
-                    <div className="mx_ViewSource_label_left">Event ID: {this.props.eventId}</div>
+                    <div className="mx_ViewSource_label_left">Room ID: {roomId}</div>
+                    <div className="mx_ViewSource_label_left">Event ID: {eventId}</div>
                     <div className="mx_ViewSource_separator" />
-                    {isEditing ? this.state.editComponent : content}
+                    {isEditing ? this.editSourceContent() : this.viewSourceContent()}
                 </div>
                 {!isEditing && (
                     <div className="mx_Dialog_buttons">
-                        <button onClick={() => this.editEvent()}>{_t("Edit")}</button>
+                        <button onClick={() => this.onEdit()}>{_t("Edit")}</button>
                     </div>
                 )}
             </BaseDialog>
diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js
index a1c111b19c..6809d28e36 100644
--- a/src/components/views/context_menus/MessageContextMenu.js
+++ b/src/components/views/context_menus/MessageContextMenu.js
@@ -124,16 +124,9 @@ export default class MessageContextMenu extends React.Component {
     };
 
     onViewSourceClick = () => {
-        const ev = this.props.mxEvent.replacingEvent() || this.props.mxEvent;
         const ViewSource = sdk.getComponent('structures.ViewSource');
         Modal.createTrackedDialog('View Event Source', '', ViewSource, {
-            roomId: ev.getRoomId(),
-            eventId: ev.getId(),
-            content: ev.event,
-            event: ev,
-            isEncrypted: this.props.mxEvent.getType() !== this.props.mxEvent.getWireType(),
-            // FIXME: _clearEvent is private
-            decryptedContent: ev._clearEvent,
+            mxEvent: this.props.mxEvent,
         }, 'mx_Dialog_viewsource');
         this.closeMenu();
     };
diff --git a/src/components/views/messages/EditHistoryMessage.js b/src/components/views/messages/EditHistoryMessage.js
index 68a3c95745..3bd9dfbd21 100644
--- a/src/components/views/messages/EditHistoryMessage.js
+++ b/src/components/views/messages/EditHistoryMessage.js
@@ -74,11 +74,7 @@ export default class EditHistoryMessage extends React.PureComponent {
     _onViewSourceClick = () => {
         const ViewSource = sdk.getComponent('structures.ViewSource');
         Modal.createTrackedDialog('View Event Source', 'Edit history', ViewSource, {
-            roomId: this.props.mxEvent.getRoomId(),
-            eventId: this.props.mxEvent.getId(),
-            content: this.props.mxEvent.event,
-            isEncrypted: this.props.mxEvent.getType() !== this.props.mxEvent.getWireType(),
-            decryptedContent: this.props.mxEvent._clearEvent,
+            mxEvent: this.props.mxEvent,
         }, 'mx_Dialog_viewsource');
     };
 

From 29b95e60833fef1bed598897dad2deff4e875ff4 Mon Sep 17 00:00:00 2001
From: Panagiotis <27917356+panoschal@users.noreply.github.com>
Date: Sat, 6 Mar 2021 16:47:29 +0200
Subject: [PATCH 178/420] fix: make edit prefill work correctly from
 EditHistory

handle encrypted and unencrypted events

get the correct event_id (the base message) when called from EditHistoryMessage

keep only the `body` and `msgtype` fields when prefilling
---
 src/components/structures/ViewSource.js | 33 +++++++++++++++++++------
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/components/structures/ViewSource.js b/src/components/structures/ViewSource.js
index 369a0a1ddd..4ee70ee2a7 100644
--- a/src/components/structures/ViewSource.js
+++ b/src/components/structures/ViewSource.js
@@ -39,6 +39,7 @@ export default class ViewSource extends React.Component {
     }
 
     onBack() {
+        // TODO: refresh the "Event ID:" modal header
         this.setState({ isEditing: false });
     }
 
@@ -80,15 +81,28 @@ export default class ViewSource extends React.Component {
         }
     }
 
+    // returns the id of the initial message, not the id of the previous edit
+    getBaseEventId() {
+        const mxEvent = this.props.mxEvent.replacingEvent() || this.props.mxEvent; // show the replacing event, not the original, if it is an edit
+        const isEncrypted = this.props.mxEvent.getType() !== this.props.mxEvent.getWireType();
+        const baseMxEvent = this.props.mxEvent;
+
+        if (isEncrypted) {
+            // `relates_to` field is inside the encrypted event
+            return mxEvent.event.content["m.relates_to"]?.event_id ?? baseMxEvent.getId();
+        } else {
+            return mxEvent.getContent()["m.relates_to"]?.event_id ?? baseMxEvent.getId();
+        }
+    }
+
     // returns the SendCustomEvent component prefilled with the correct details
     editSourceContent() {
         const mxEvent = this.props.mxEvent.replacingEvent() || this.props.mxEvent; // show the replacing event, not the original, if it is an edit
 
         const isStateEvent = mxEvent.isState();
-        console.log("isStateEvent", isStateEvent);
         const roomId = mxEvent.getRoomId();
-        const eventId = mxEvent.getId();
         const originalContent = mxEvent.getContent();
+
         if (isStateEvent) {
             return (
                 <MatrixClientContext.Consumer>
@@ -107,14 +121,19 @@ export default class ViewSource extends React.Component {
                 </MatrixClientContext.Consumer>
             );
         } else {
-            // send an edit-message event
-            // prefill the "m.new_content" field
+            // prefill an edit-message event
+            // keep only the `body` and `msgtype` fields of originalContent
+            const bodyToStartFrom = originalContent["m.new_content"]?.body ?? originalContent.body; // prefill the last edit body, to start editing from there
             const newContent = {
-                ...originalContent,
-                "m.new_content": originalContent,
+                "body": ` * ${bodyToStartFrom}`,
+                "msgtype": originalContent.msgtype,
+                "m.new_content": {
+                    body: bodyToStartFrom,
+                    msgtype: originalContent.msgtype,
+                },
                 "m.relates_to": {
                     rel_type: "m.replace",
-                    event_id: eventId,
+                    event_id: this.getBaseEventId(),
                 },
             };
             return (

From df52ec28d60ecdf9719f3b5339a805f6a643f753 Mon Sep 17 00:00:00 2001
From: Panagiotis <27917356+panoschal@users.noreply.github.com>
Date: Sat, 6 Mar 2021 17:09:46 +0200
Subject: [PATCH 179/420] fix: show edit button only if you have permission

---
 src/components/structures/ViewSource.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/ViewSource.js b/src/components/structures/ViewSource.js
index 4ee70ee2a7..ddcffe4f7f 100644
--- a/src/components/structures/ViewSource.js
+++ b/src/components/structures/ViewSource.js
@@ -23,6 +23,7 @@ import { _t } from "../../languageHandler";
 import * as sdk from "../../index";
 import MatrixClientContext from "../../contexts/MatrixClientContext";
 import { SendCustomEvent } from "../views/dialogs/DevtoolsDialog";
+import { canEditContent } from "../../utils/EventUtils";
 
 export default class ViewSource extends React.Component {
     static propTypes = {
@@ -162,6 +163,7 @@ export default class ViewSource extends React.Component {
         const isEditing = this.state.isEditing;
         const roomId = mxEvent.getRoomId();
         const eventId = mxEvent.getId();
+        const canEdit = canEditContent(this.props.mxEvent);
         return (
             <BaseDialog className="mx_ViewSource" onFinished={this.props.onFinished} title={_t("View Source")}>
                 <div>
@@ -170,7 +172,7 @@ export default class ViewSource extends React.Component {
                     <div className="mx_ViewSource_separator" />
                     {isEditing ? this.editSourceContent() : this.viewSourceContent()}
                 </div>
-                {!isEditing && (
+                {!isEditing && canEdit && (
                     <div className="mx_Dialog_buttons">
                         <button onClick={() => this.onEdit()}>{_t("Edit")}</button>
                     </div>

From 1d8c9375cfb511b295dd6228963d8b5d0f687a2e Mon Sep 17 00:00:00 2001
From: libexus <Asterixeins324@gmail.com>
Date: Thu, 4 Mar 2021 20:35:28 +0000
Subject: [PATCH 180/420] Translated using Weblate (German)

Currently translated at 99.3% (2761 of 2780 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-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 8a07b6cd9f..13fc6fc3b7 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -3070,5 +3070,6 @@
     "Value": "Wert",
     "Setting ID": "Einstellungs-ID",
     "Failed to save settings": "Einstellungen konnten nicht gespeichert werden",
-    "Show chat effects (animations when receiving e.g. confetti)": "Animierte Chateffekte zeigen, wenn z.B. Konfetti-Emojis erhalten werden"
+    "Show chat effects (animations when receiving e.g. confetti)": "Animierte Chateffekte zeigen, wenn z.B. Konfetti-Emojis erhalten werden",
+    "Save setting values": "Einstellungswerte speichern"
 }

From ccb47285bc3030697fd88db50eca7d3742504ac7 Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Thu, 4 Mar 2021 20:34:54 +0000
Subject: [PATCH 181/420] Translated using Weblate (German)

Currently translated at 99.3% (2761 of 2780 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-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 13fc6fc3b7..07a1a4f805 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -3071,5 +3071,6 @@
     "Setting ID": "Einstellungs-ID",
     "Failed to save settings": "Einstellungen konnten nicht gespeichert werden",
     "Show chat effects (animations when receiving e.g. confetti)": "Animierte Chateffekte zeigen, wenn z.B. Konfetti-Emojis erhalten werden",
-    "Save setting values": "Einstellungswerte speichern"
+    "Save setting values": "Einstellungswerte speichern",
+    "Caution:": "Vorsicht:"
 }

From 395c010a84deb26d2fa812022376d2ef22825392 Mon Sep 17 00:00:00 2001
From: iaiz <git@iapellaniz.com>
Date: Sat, 6 Mar 2021 21:01:51 +0000
Subject: [PATCH 182/420] Translated using Weblate (Spanish)

Currently translated at 100.0% (2780 of 2780 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/es/
---
 src/i18n/strings/es.json | 439 +++++++++++++++++++++++----------------
 1 file changed, 261 insertions(+), 178 deletions(-)

diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index cbe7e0a223..4b50d59f2a 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -45,7 +45,7 @@
     "Cryptography": "Criptografía",
     "Current password": "Contraseña actual",
     "/ddg is not a command": "/ddg no es un comando",
-    "Deactivate Account": "Desactivar Cuenta",
+    "Deactivate Account": "Desactivar cuenta",
     "Decrypt %(text)s": "Descifrar %(text)s",
     "Deops user with given id": "Quita el poder de operador al usuario con la ID dada",
     "Default": "Por defecto",
@@ -65,18 +65,18 @@
     "Failed to change power level": "Falló al cambiar de nivel de acceso",
     "Failed to forget room %(errCode)s": "No se pudo olvidar la sala %(errCode)s",
     "Failed to join room": "No se pudo unir a la sala",
-    "Failed to kick": "Falló al expulsar",
+    "Failed to kick": "No se ha podido echar",
     "Failed to leave room": "No se pudo salir de la sala",
-    "Failed to load timeline position": "Falló al cargar el historico",
+    "Failed to load timeline position": "Fallo al cargar el historial",
     "Failed to mute user": "No se pudo silenciar al usuario",
     "Failed to reject invite": "Falló al rechazar invitación",
     "Failed to reject invitation": "Falló al rechazar la invitación",
     "Failed to send email": "No se pudo enviar el correo electrónico",
     "Failed to send request.": "El envío de la solicitud falló.",
-    "Failed to set display name": "No se pudo establecer el nombre público",
+    "Failed to set display name": "No se ha podido cambiar el nombre público",
     "Failed to unban": "No se pudo quitar veto",
-    "Failed to verify email address: make sure you clicked the link in the email": "No se pudo verificar la dirección de correo electrónico: asegúrate de hacer clic en el enlace del correo electrónico",
-    "Failure to create room": "No se pudo crear sala",
+    "Failed to verify email address: make sure you clicked the link in the email": "No se ha podido verificar la dirección de correo electrónico: asegúrate de hacer clic en el enlace del mensaje",
+    "Failure to create room": "No se ha podido crear la sala",
     "Favourite": "Añadir a favoritos",
     "Favourites": "Favoritos",
     "Fill screen": "Llenar pantalla",
@@ -100,10 +100,10 @@
     "Sign in with": "Quiero iniciar sesión con",
     "Join Room": "Unirse a la Sala",
     "%(targetName)s joined the room.": "%(targetName)s se unió a la sala.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s expulsó a %(targetName)s.",
-    "Kick": "Expulsar",
-    "Kicks user with given id": "Expulsa al usuario con la ID dada",
-    "Labs": "Laboratorios",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s echó a %(targetName)s.",
+    "Kick": "Echar",
+    "Kicks user with given id": "Echa al usuario con la ID dada",
+    "Labs": "Experimentos",
     "Leave room": "Salir de la sala",
     "%(targetName)s left the room.": "%(targetName)s salió de la sala.",
     "Logout": "Cerrar sesión",
@@ -134,7 +134,7 @@
     "Incorrect username and/or password.": "Nombre de usuario y/o contraseña incorrectos.",
     "Invited": "Invitado",
     "Jump to first unread message.": "Ir al primer mensaje no leído.",
-    "Last seen": "Visto por última vez",
+    "Last seen": "Último uso",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s hizo visible el historial futuro de la sala para todos los miembros de la sala, desde el momento en que son invitados.",
     "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s hizo visible el historial futuro de la sala para todos los miembros de la sala, desde el momento en que se unieron.",
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s hizo visible el historial futuro de la sala para todos los miembros de la sala.",
@@ -173,7 +173,7 @@
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s invitó a %(targetDisplayName)s a unirse a la sala.",
     "Server error": "Error del servidor",
     "Server may be unavailable, overloaded, or search timed out :(": "El servidor podría estar saturado o desconectado, o la búsqueda caducó :(",
-    "Server may be unavailable, overloaded, or you hit a bug.": "El servidor podría estar saturado o desconectado, o encontraste un fallo.",
+    "Server may be unavailable, overloaded, or you hit a bug.": "El servidor podría estar saturado o desconectado, o has encontrado un fallo.",
     "Server unavailable, overloaded, or something else went wrong.": "Servidor saturado, desconectado, o alguien ha roto algo.",
     "Session ID": "ID de Sesión",
     "%(senderName)s set a profile picture.": "%(senderName)s estableció una imagen de perfil.",
@@ -182,7 +182,7 @@
     "Signed Out": "Desconectado",
     "Sign in": "Conectar",
     "Sign out": "Cerrar sesión",
-    "%(count)s of your messages have not been sent.|other": "Algunos de sus mensajes no han sido enviados.",
+    "%(count)s of your messages have not been sent.|other": "Algunos de tus mensajes no han sido enviados.",
     "Someone": "Alguien",
     "Start authentication": "Iniciar autenticación",
     "Submit": "Enviar",
@@ -191,8 +191,8 @@
     "Active call (%(roomName)s)": "Llamada activa (%(roomName)s)",
     "Add a topic": "Añadir un tema",
     "No media permissions": "Sin permisos para el medio",
-    "You may need to manually permit %(brand)s to access your microphone/webcam": "Probablemente necesite dar permisos manualmente a %(brand)s para su micrófono/cámara",
-    "Are you sure you want to leave the room '%(roomName)s'?": "¿Seguro que quieres salir de la sala '%(roomName)s'?",
+    "You may need to manually permit %(brand)s to access your microphone/webcam": "Probablemente necesites dar permisos manualmente a %(brand)s para tu micrófono/cámara",
+    "Are you sure you want to leave the room '%(roomName)s'?": "¿Salir de la sala «%(roomName)s?",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "No se puede conectar al servidor base. Por favor, comprueba tu conexión, asegúrate de que el <a>certificado SSL del servidor</a> es de confiaza, y comprueba que no haya extensiones de navegador bloqueando las peticiones.",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s eliminó el nombre de la sala.",
     "Drop File Here": "Deje el fichero aquí",
@@ -214,7 +214,7 @@
     "No results": "No hay resultados",
     "No users have specific privileges in this room": "Ningún usuario tiene permisos específicos en esta sala",
     "OK": "Vale",
-    "olm version:": "versión de olm:",
+    "olm version:": "Versión de olm:",
     "Only people who have been invited": "Solo las personas que hayan sido invitadas",
     "Operation failed": "Falló la operación",
     "Password": "Contraseña",
@@ -238,19 +238,19 @@
     "Results from DuckDuckGo": "Resultados desde DuckDuckGo",
     "Return to login screen": "Regresar a la pantalla de inicio de sesión",
     "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s no tiene permiso para enviarte notificaciones - por favor, comprueba los ajustes de tu navegador",
-    "%(brand)s was not given permission to send notifications - please try again": "No se le dio permiso a %(brand)s para enviar notificaciones - por favor, inténtalo nuevamente",
+    "%(brand)s was not given permission to send notifications - please try again": "No le has dado permiso a %(brand)s para enviar notificaciones. Por favor, inténtalo de nuevo",
     "%(brand)s version:": "Versión de %(brand)s:",
     "Room %(roomId)s not visible": "La sala %(roomId)s no está visible",
     "Searches DuckDuckGo for results": "Busca resultados en DuckDuckGo",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Mostrar marcas temporales en formato de 12 horas (ej. 2:30pm)",
     "This email address is already in use": "Esta dirección de correo electrónico ya está en uso",
-    "This email address was not found": "No se encontró esta dirección de correo electrónico",
+    "This email address was not found": "No se ha encontrado la dirección de correo electrónico",
     "The email address linked to your account must be entered.": "Debes ingresar la dirección de correo electrónico vinculada a tu cuenta.",
-    "The remote side failed to pick up": "El lado remoto no contestó",
+    "The remote side failed to pick up": "El otro lado no ha respondido a la llamada",
     "This room has no local addresses": "Esta sala no tiene direcciones locales",
     "This room is not recognised.": "No se reconoce esta sala.",
     "This doesn't appear to be a valid email address": "Esto no parece un e-mail váido",
-    "This phone number is already in use": "Este número telefónico ya está en uso",
+    "This phone number is already in use": "Este número de teléfono ya está en uso",
     "This room": "Esta sala",
     "This room is not accessible by remote Matrix servers": "Esta sala no es accesible por otros servidores Matrix",
     "Cancel": "Cancelar",
@@ -308,9 +308,9 @@
     "You are already in a call.": "Ya estás participando en una llamada.",
     "You are not in this room.": "No estás en esta sala.",
     "You do not have permission to do that in this room.": "No tienes permiso para realizar esa acción en esta sala.",
-    "You cannot place a call with yourself.": "No puedes realizar una llamada contigo mismo.",
+    "You cannot place a call with yourself.": "No puedes llamarte a ti mismo.",
     "Cannot add any more widgets": "no es posible agregar mas widgets",
-    "Publish this room to the public in %(domain)s's room directory?": "¿Quieres que esta sala aparezca en el directorio de salas de %(domain)s?",
+    "Publish this room to the public in %(domain)s's room directory?": "¿Quieres que la sala aparezca en el directorio de salas de %(domain)s?",
     "AM": "AM",
     "PM": "PM",
     "The maximum permitted number of widgets have already been added to this room.": "La cantidad máxima de widgets permitida ha sido alcanzada en esta sala.",
@@ -323,20 +323,20 @@
     "You have <a>disabled</a> URL previews by default.": "Has <a>desactivado</a> la vista previa de URLs por defecto.",
     "You have <a>enabled</a> URL previews by default.": "Has <a>activado</a> las vista previa de URLs por defecto.",
     "You have no visible notifications": "No tiene notificaciones visibles",
-    "You must <a>register</a> to use this functionality": "Usted debe ser un <a>registrar</a> para usar esta funcionalidad",
+    "You must <a>register</a> to use this functionality": "<a>Regístrate</a> para usar esta funcionalidad",
     "You need to be able to invite users to do that.": "Debes ser capaz de invitar usuarios para realizar esa acción.",
     "You need to be logged in.": "Necesitas haber iniciado sesión.",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Tu dirección de correo electrónico no parece estar asociada a una ID de Matrix en este servidor base.",
     "You seem to be in a call, are you sure you want to quit?": "Parece estar en medio de una llamada, ¿esta seguro que desea salir?",
     "You seem to be uploading files, are you sure you want to quit?": "Pareces estar subiendo archivos, ¿seguro que quieres salir?",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "No podrás deshacer este cambio porque estás promoviendo al usuario para tener el mismo nivel de autoridad que tú.",
-    "Sun": "Dom",
-    "Mon": "Lun",
-    "Tue": "Mar",
-    "Wed": "Mie",
-    "Thu": "Jue",
-    "Fri": "Vie",
-    "Sat": "Sab",
+    "Sun": "dom.",
+    "Mon": "lun.",
+    "Tue": "mar.",
+    "Wed": "mié.",
+    "Thu": "jue.",
+    "Fri": "vie.",
+    "Sat": "sáb.",
     "Jan": "Ene",
     "Feb": "Feb",
     "Mar": "Mar",
@@ -346,25 +346,25 @@
     "Jul": "Jul",
     "Aug": "Ago",
     "Add rooms to this community": "Agregar salas a esta comunidad",
-    "Call Failed": "La Llamada Falló",
+    "Call Failed": "Llamada fallida",
     "Sep": "Sep",
     "Oct": "Oct",
     "Nov": "Nov",
     "Dec": "Dic",
     "Warning": "Advertencia",
-    "Unpin Message": "Desmarcar Mensaje",
+    "Unpin Message": "Desanclar mensaje",
     "Online": "En línea",
     "Submit debug logs": "Enviar registros de depuración",
     "The platform you're on": "La plataforma en la que te encuentras",
-    "The version of %(brand)s": "La version de %(brand)s",
-    "Your language of choice": "El idioma de tu elección",
+    "The version of %(brand)s": "La versión de %(brand)s",
+    "Your language of choice": "Idioma elegido",
     "Your homeserver's URL": "La URL de tu servidor base",
     "The information being sent to us to help make %(brand)s better includes:": "La información que se nos envía para ayudarnos a mejorar %(brand)s incluye:",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Estés utilizando o no el modo de Texto Enriquecido del Editor de Texto Enriquecido",
     "Who would you like to add to this community?": "¿A quién te gustaría añadir a esta comunidad?",
     "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Advertencia: cualquier persona que añadas a una comunidad será públicamente visible a cualquiera que conozca la ID de la comunidad",
     "Invite new community members": "Invita nuevos miembros a la comunidad",
-    "Invite to Community": "Invitar a la Comunidad",
+    "Invite to Community": "Invitar a la comunidad",
     "Which rooms would you like to add to this community?": "¿Qué salas te gustaría añadir a esta comunidad?",
     "Fetching third party location failed": "Falló la obtención de la ubicación de un tercero",
     "I understand the risks and wish to continue": "Entiendo los riesgos y deseo continuar",
@@ -487,7 +487,7 @@
     "Event Type": "Tipo de Evento",
     "No rooms to show": "No hay salas para mostrar",
     "Download this file": "Descargar este archivo",
-    "Pin Message": "Fijar Mensaje",
+    "Pin Message": "Anclar mensaje",
     "Failed to change settings": "Error al cambiar los ajustes",
     "View Community": "Ver la comunidad",
     "Developer Tools": "Herramientas de desarrollo",
@@ -500,13 +500,13 @@
     "Every page you use in the app": "Cada página que utilizas en la aplicación",
     "Your device resolution": "La resolución de tu dispositivo",
     "Which officially provided instance you are using, if any": "Qué instancia proporcionada oficialmente estás utilizando, si estás utilizando alguna",
-    "e.g. %(exampleValue)s": "ej. %(exampleValue)s",
-    "e.g. <CurrentPageURL>": "ej. <CurrentPageURL>",
+    "e.g. %(exampleValue)s": "ej.: %(exampleValue)s",
+    "e.g. <CurrentPageURL>": "ej.: <CurrentPageURL>",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Donde esta página incluya información identificable, como una sala, usuario o ID de grupo, esos datos se eliminan antes de enviarse al servidor.",
-    "Call in Progress": "Llamada en Curso",
+    "Call in Progress": "Llamada en curso",
     "A call is currently being placed!": "¡Se está realizando una llamada en este momento!",
     "A call is already in progress!": "¡Ya hay una llamada en curso!",
-    "Permission Required": "Permiso Requerido",
+    "Permission Required": "Se necesita permiso",
     "You do not have permission to start a conference call in this room": "No tienes permiso para iniciar una llamada de conferencia en esta sala",
     "%(weekDayName)s %(time)s": "%(weekDayName)s a las %(time)s",
     "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s %(day)s de %(monthName)s a las %(time)s",
@@ -529,13 +529,13 @@
     "You are no longer ignoring %(userId)s": "Ya no ignoras a %(userId)s",
     "Opens the Developer Tools dialog": "Abre el diálogo de Herramientas de Desarrollador",
     "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s cambió su nombre público a %(displayName)s.",
-    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s cambió los mensajes con chincheta en la sala.",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s cambió los mensajes anclados de la sala.",
     "%(widgetName)s widget modified by %(senderName)s": "el widget %(widgetName)s fue modificado por %(senderName)s",
     "%(widgetName)s widget added by %(senderName)s": "componente %(widgetName)s añadido por %(senderName)s",
     "%(widgetName)s widget removed by %(senderName)s": "componente %(widgetName)s eliminado por %(senderName)s",
     "Your browser does not support the required cryptography extensions": "Su navegador no soporta las extensiones de criptografía requeridas",
     "Not a valid %(brand)s keyfile": "No es un archivo de claves de %(brand)s válido",
-    "Message Pinning": "Mensajes con chincheta",
+    "Message Pinning": "Mensajes anclados",
     "Always show encryption icons": "Mostrar siempre iconos de cifrado",
     "Automatically replace plain text Emoji": "Reemplazar automáticamente texto por Emojis",
     "Mirror local video feed": "Clonar transmisión de video local",
@@ -556,9 +556,9 @@
     "Kick this user?": "¿Echar a este usuario?",
     "Unban this user?": "¿Quitarle el veto a este usuario?",
     "Ban this user?": "¿Vetar a este usuario?",
-    "Demote yourself?": "¿Degradarse a ud mismo?",
-    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "No podrá deshacer este cambio ya que está degradándose a usted mismo, si es el usuario con menos privilegios de la sala le resultará imposible recuperarlos.",
-    "Demote": "Degradar",
+    "Demote yourself?": "¿Quitarte permisos a ti mismo?",
+    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "No podrás deshacer este cambio ya que estás quitándote permisos a ti mismo, si eres el último usuario con privilegios de la sala te resultará imposible recuperarlos.",
+    "Demote": "Quitar permisos",
     "Unignore": "Dejar de ignorar",
     "Ignore": "Ignorar",
     "Jump to read receipt": "Saltar a recibo leído",
@@ -567,10 +567,10 @@
     "Share Link to User": "Compartir enlace al usuario",
     "Send an encrypted reply…": "Enviar una respuesta cifrada…",
     "Send an encrypted message…": "Enviar un mensaje cifrado…",
-    "Jump to message": "Ir a mensaje",
-    "No pinned messages.": "No hay mensajes con chincheta.",
+    "Jump to message": "Ir al mensaje",
+    "No pinned messages.": "No hay mensajes anclados.",
     "Loading...": "Cargando...",
-    "Pinned Messages": "Mensajes con chincheta",
+    "Pinned Messages": "Mensajes anclados",
     "%(duration)ss": "%(duration)ss",
     "%(duration)sm": "%(duration)sm",
     "%(duration)sh": "%(duration)sh",
@@ -590,18 +590,18 @@
     "Community Invites": "Invitaciones a comunidades",
     "Banned by %(displayName)s": "Vetado por %(displayName)s",
     "Muted Users": "Usuarios silenciados",
-    "Members only (since the point in time of selecting this option)": "Solo miembros (desde el momento en que se selecciona esta opción)",
-    "Members only (since they were invited)": "Solo miembros (desde que fueron invitados)",
-    "Members only (since they joined)": "Solo miembros (desde que se unieron)",
+    "Members only (since the point in time of selecting this option)": "Solo participantes (desde el momento en que se selecciona esta opción)",
+    "Members only (since they were invited)": "Solo participantes (desde que fueron invitados)",
+    "Members only (since they joined)": "Solo participantes (desde que se unieron)",
     "You don't currently have any stickerpacks enabled": "Actualmente no tienes ningún paquete de pegatinas activado",
     "Stickerpack": "Paquete de pegatinas",
     "Hide Stickers": "Ocultar Pegatinas",
-    "Show Stickers": "Mostrar Pegatinas",
+    "Show Stickers": "Pegatinas",
     "Invalid community ID": "ID de comunidad inválida",
     "'%(groupId)s' is not a valid community ID": "'%(groupId)s' no es una ID de comunidad válida",
     "Flair": "Insignia",
     "Showing flair for these communities:": "Mostrar insignias de las siguientes comunidades:",
-    "This room is not showing flair for any communities": "Esta sala no está mostrando insignias para ninguna comunidad",
+    "This room is not showing flair for any communities": "Esta sala no está mostrando insignias de ninguna comunidad",
     "New community ID (e.g. +foo:%(localDomain)s)": "Nueva ID de comunidad (ej. +foo:%(localDomain)s)",
     "URL previews are enabled by default for participants in this room.": "La vista previa de URL se activa por defecto en los participantes de esta sala.",
     "URL previews are disabled by default for participants in this room.": "La vista previa se desactiva por defecto para los participantes de esta sala.",
@@ -617,7 +617,7 @@
     "Copied!": "¡Copiado!",
     "Failed to copy": "Falló la copia",
     "Add an Integration": "Añadir una Integración",
-    "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?": "Está a punto de ir a un sitio de terceros de modo que pueda autenticar su cuenta para usarla con %(integrationsUrl)s. ¿Desea continuar?",
+    "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?": "Estás a punto de ir a un sitio de terceros de modo que pueda autenticar su cuenta para usarla con %(integrationsUrl)s. ¿Quieres continuar?",
     "An email has been sent to %(emailAddress)s": "Se envió un correo electrónico a %(emailAddress)s",
     "Please check your email to continue registration.": "Por favor consulta tu correo electrónico para continuar con el registro.",
     "Token incorrect": "Token incorrecto",
@@ -648,7 +648,7 @@
     "You're not currently a member of any communities.": "Actualmente no formas parte de ninguna comunidad.",
     "Unknown Address": "Dirección desconocida",
     "Delete Widget": "Eliminar Componente",
-    "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Al borrar un widget se elimina para todos usuarios de la sala. ¿Está seguro?",
+    "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Al borrar un widget se elimina para todos usuarios de la sala. ¿Estás seguro?",
     "Failed to remove widget": "Falló la eliminación del widget",
     "An error ocurred whilst trying to remove the widget from the room": "Ocurrió un error mientras se intentaba eliminar el widget de la sala",
     "Minimize apps": "Minimizar apps",
@@ -717,8 +717,8 @@
     "email address": "dirección de correo electrónico",
     "You have entered an invalid address.": "No ha introducido una dirección correcta.",
     "Try using one of the following valid address types: %(validTypesList)s.": "Intente usar uno de los tipos de direcciones válidos: %(validTypesList)s.",
-    "Confirm Removal": "Confirmar Eliminación",
-    "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.": "¿Seguro que quieres eliminar (borrar) este evento? Ten en cuenta que si borras un cambio de nombre o tema de sala, podrías deshacer el cambio.",
+    "Confirm Removal": "Confirmar eliminación",
+    "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.": "¿Seguro que quieres eliminar este evento? Ten en cuenta que, si borras un cambio de nombre o tema de sala, podrías deshacer el cambio.",
     "Community IDs cannot be empty.": "Las IDs de comunidad no pueden estar vacías.",
     "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Las IDs de comunidad sólo pueden contener caracteres a-z, 0-9, ó '=_-./'",
     "Something went wrong whilst creating your community": "Algo fue mal mientras se creaba la comunidad",
@@ -728,8 +728,8 @@
     "Community ID": "ID de Comunidad",
     "example": "ejemplo",
     "Create": "Crear",
-    "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>": "Esto hará que tu cuenta quede permanentemente inutilizable. No podrás iniciar sesión, y nadie podrá volver a registrar la misma ID de usuario. Esto hará que tu cuenta salga de todas las salas en las cuales participa, y eliminará los datos de tu cuenta de tu servidor de identidad. <b>Esta acción es 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.": "Desactivar tu cuenta <b>no hace que por defecto olvidemos los mensajes que has enviado.</b> Si quieres que olvidemos tus mensajes, por favor marca la casilla a continuación.",
+    "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>": "Esto hará que tu cuenta quede permanentemente inutilizable. No podrás iniciar sesión, y nadie podrá volver a registrar la misma ID de usuario. Saldrás de todas salas en las que participas, y eliminará los datos de tu cuenta de tu servidor de identidad. <b>Esta acción es 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.": "Desactivar tu cuenta <b>no hace que por defecto olvidemos los mensajes que has enviado.</b> Si quieres que olvidemos tus mensajes, marca la casilla a continuación, por favor.",
     "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "La visibilidad de mensajes en Matrix es similar a la del correo electrónico. Que olvidemos tus mensajes implica que los mensajes que hayas enviado no se compartirán con ningún usuario nuevo o no registrado, pero aquellos usuarios registrados que ya tengan acceso a estos mensajes seguirán teniendo acceso a su copia.",
     "Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)": "Por favor, olvida todos los mensajes enviados al desactivar mi cuenta. (<b>Advertencia:</b> esto provocará que los usuarios futuros vean conversaciones incompletas)",
     "To continue, please enter your password:": "Para continuar, introduce tu contraseña, por favor:",
@@ -784,7 +784,7 @@
     "%(inviter)s has invited you to join this community": "%(inviter)s te invitó a unirte a esta comunidad",
     "Join this community": "Unirse a esta comunidad",
     "Leave this community": "Salir de esta comunidad",
-    "You are an administrator of this community": "Usted es un administrador de esta comunidad",
+    "You are an administrator of this community": "Eres administrador de esta comunidad",
     "You are a member of this community": "Usted es un miembro de esta comunidad",
     "Who can join this community?": "¿Quién puede unirse a esta comunidad?",
     "Everyone": "Todo el mundo",
@@ -793,7 +793,7 @@
     "Description": "Descripción",
     "Community %(groupId)s not found": "No se encontraron %(groupId)s de la comunidad",
     "Failed to load %(groupId)s": "Falló la carga de %(groupId)s",
-    "This room is not public. You will not be able to rejoin without an invite.": "Esta sala no es pública. No podrá volver a unirse sin una invitación.",
+    "This room is not public. You will not be able to rejoin without an invite.": "Esta sala no es pública. No podrás volver a unirte sin una invitación.",
     "Can't leave Server Notices room": "No se puede salir de la sala de avisos del servidor",
     "This room is used for important messages from the Homeserver, so you cannot leave it.": "La sala se usa para mensajes importantes del servidor base, así que no puedes abandonarla.",
     "Terms and Conditions": "Términos y condiciones",
@@ -807,11 +807,11 @@
     "Error whilst fetching joined communities": "Error al recuperar las comunidades a las que estás unido",
     "Create a new community": "Crear una comunidad nueva",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Crear una comunidad para agrupar usuarios y salas. Construye una página de inicio personalizada para destacarla.",
-    "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "No puede enviar ningún mensaje hasta que revise y esté de acuerdo con <consentLink>nuestros términos y condiciones</consentLink>.",
-    "%(count)s of your messages have not been sent.|one": "No se envió su mensaje.",
+    "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "No puedes enviar ningún mensaje hasta que revises y estés de acuerdo con <consentLink>nuestros términos y condiciones</consentLink>.",
+    "%(count)s of your messages have not been sent.|one": "No se ha enviado tu mensaje.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Reenviar todo</resendText> o <cancelText>cancelar todo</cancelText> ahora. También puedes seleccionar mensajes individuales para reenviar o cancelar.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Reenviar mensaje</resendText> o <cancelText>cancelar mensaje</cancelText> ahora.",
-    "Connectivity to the server has been lost.": "Se perdió la conexión con el servidor.",
+    "Connectivity to the server has been lost.": "Se ha perdido la conexión con el servidor.",
     "Sent messages will be stored until your connection has returned.": "Los mensajes enviados se almacenarán hasta que vuelva la conexión.",
     "Active call": "Llamada activa",
     "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "¡No hay nadie aquí! ¿Le gustaría <inviteText>invitar a otros</inviteText> o <nowarnText>dejar de advertir sobre la sala vacía</nowarnText>?",
@@ -823,8 +823,8 @@
     "Learn more about how we use analytics.": "Más información sobre el uso de los análisis de estadísticas.",
     "Check for update": "Comprobar actualizaciones",
     "Start automatically after system login": "Ejecutar automáticamente después de iniciar sesión en el sistema",
-    "No Audio Outputs detected": "No se detectaron Salidas de Sonido",
-    "Audio Output": "Salida de Sonido",
+    "No Audio Outputs detected": "No se han detectado salidas de sonido",
+    "Audio Output": "Salida de sonido",
     "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Se envió un correo electrónico a %(emailAddress)s. Una vez hayas seguido el enlace que contiene, haz clic a continuación.",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Por favor, ten en cuenta que estás iniciando sesión en el servidor %(hs)s, y no en matrix.org.",
     "This homeserver doesn't offer any login flows which are supported by this client.": "Este servidor base no ofrece ningún flujo de inicio de sesión soportado por este cliente.",
@@ -849,7 +849,7 @@
     "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.": "Tu mensaje no se ha enviado porque este servidor base ha alcanzado su límite mensual de usuarios activos. Por favor, <a>contacta con el administrador de tu servicio</a> para continuar utilizándolo.",
     "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.": "Tu mensaje no se ha enviado porque este servidor base ha excedido un límite de recursos. Por favor <a>contacta con el administrador de tu servicio</a> para continuar utilizándolo.",
     "Please <a>contact your service administrator</a> to continue using this service.": "Por favor, <a>contacta al administrador de tu servicio</a> para continuar utilizando este servicio.",
-    "System Alerts": "Alertas de Sistema",
+    "System Alerts": "Alertas del sistema",
     "Forces the current outbound group session in an encrypted room to be discarded": "Obliga a que la sesión de salida grupal actual en una sala cifrada se descarte",
     "Sorry, your homeserver is too old to participate in this room.": "Lo sentimos, tu servidor base tiene una versión demasiado antigua como para participar en esta sala.",
     "Please contact your homeserver administrator.": "Por favor, contacta con la administración de tu servidor base.",
@@ -880,7 +880,7 @@
     "Email addresses": "Correos electrónicos",
     "Language and region": "Idioma y región",
     "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "El fichero %(fileName)s supera el tamaño límite del servidor para subidas",
-    "Unable to load! Check your network connectivity and try again.": "¡No es posible cargar! Comprueba tu conexión de red e inténtalo de nuevo.",
+    "Unable to load! Check your network connectivity and try again.": "No se ha podido cargar. Comprueba tu conexión de red e inténtalo de nuevo.",
     "Failed to invite users to the room:": "Fallo al invitar usuarios a la sala:",
     "Upgrades a room to a new version": "Actualiza una sala a una nueva versión",
     "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s actualizó esta sala.",
@@ -888,10 +888,10 @@
     "%(senderDisplayName)s made the room invite only.": "%(senderDisplayName)s restringió la sala a invitados.",
     "%(senderDisplayName)s has allowed guests to join the room.": "%(senderDisplayName)s ha permitido a los invitados unirse a la sala.",
     "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)s ha prohibido que los invitados se unan a la sala.",
-    "%(displayName)s is typing …": "%(displayName)s está escribiendo …",
-    "%(names)s and %(count)s others are typing …|other": "%(names)s y otros %(count)s están escribiendo …",
-    "%(names)s and %(count)s others are typing …|one": "%(names)s y otro están escribiendo …",
-    "%(names)s and %(lastPerson)s are typing …": "%(names)s y %(lastPerson)s están escribiendo …",
+    "%(displayName)s is typing …": "%(displayName)s está escribiendo…",
+    "%(names)s and %(count)s others are typing …|other": "%(names)s y otros %(count)s están escribiendo…",
+    "%(names)s and %(count)s others are typing …|one": "%(names)s y otra persona están escribiendo…",
+    "%(names)s and %(lastPerson)s are typing …": "%(names)s y %(lastPerson)s están escribiendo…",
     "Unrecognised address": "Dirección desconocida",
     "You do not have permission to invite people to this room.": "No tienes permisos para inviitar gente a esta sala.",
     "User %(user_id)s does not exist": "El usuario %(user_id)s no existe",
@@ -1036,9 +1036,9 @@
     "Open Devtools": "Abrir devtools",
     "General": "General",
     "Room Addresses": "Direcciones de sala",
-    "Set a new account password...": "Establecer una nueva contraseña para la cuenta...",
+    "Set a new account password...": "Elegir una nueva contraseña para la cuenta...",
     "Account management": "Gestión de la cuenta",
-    "Deactivating your account is a permanent action - be careful!": "Desactivar tu cuenta es permanente - ¡Cuidado!",
+    "Deactivating your account is a permanent action - be careful!": "Desactivar tu cuenta es permanente. ¡Cuidado!",
     "Credits": "Créditos",
     "For help with using %(brand)s, click <a>here</a>.": "Si necesitas ayuda usando %(brand)s, haz clic <a>aquí</a>.",
     "For help with using %(brand)s, click <a>here</a> or start a chat with our bot using the button below.": "Si necesitas ayuda usando %(brand)s, haz clic <a>aquí</a> o abre un chat con nuestro bot usando el botón de abajo.",
@@ -1051,7 +1051,7 @@
     "Room list": "Lista de salas",
     "Autocomplete delay (ms)": "Retardo autocompletado (ms)",
     "Roles & Permissions": "Roles y permisos",
-    "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Los cambios que se hagan sobre quien puede leer el historial se aplicarán solo a nuevos mensajes en esta sala. La visibilidad del historial actual no cambiará.",
+    "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Los cambios que se hagan sobre quién puede leer el historial se aplicarán solo a nuevos mensajes. La visibilidad del historial actual no cambiará.",
     "Security & Privacy": "Seguridad y privacidad",
     "Encryption": "Cifrado",
     "Once enabled, encryption cannot be disabled.": "Una vez activado, el cifrado no se puede desactivar.",
@@ -1066,7 +1066,7 @@
     "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Haz copia de manera segura de tus claves para evitar perderlas. <a>Lee más.</a>",
     "Not now": "Ahora no",
     "Don't ask me again": "No preguntarme más",
-    "Add some now": "Añadir algunos ahora",
+    "Add some now": "Añadir alguno ahora",
     "Main address": "Dirección principal",
     "Room avatar": "Avatar de la sala",
     "Room Name": "Nombre de sala",
@@ -1082,7 +1082,7 @@
     "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 %(brand)s to do this": "Para evitar perder tu historial de chat, debes exportar las claves de la sala antes de salir. Debes volver a la versión actual de %(brand)s para esto",
     "Incompatible Database": "Base de datos incompatible",
     "Continue With Encryption Disabled": "Seguir con cifrado desactivado",
-    "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Verifica ese usuario para marcar como confiable. Confiar en usuarios aporta mucha tranquilidad en los mensajes cifrados de extremo a extremo.",
+    "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Verifica a este usuario para marcarlo como de confianza. Confiar en usuarios aporta tranquilidad en los mensajes cifrados de extremo a extremo.",
     "Waiting for partner to confirm...": "Esperando que confirme el compañero...",
     "Incoming Verification Request": "Petición de verificación entrante",
     "%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s cambió la regla para unirse a %(rule)s",
@@ -1092,12 +1092,12 @@
     "Verify this user by confirming the following emoji appear on their screen.": "Verifica este usuario confirmando que los siguientes emojis aparecen en su pantalla.",
     "Your %(brand)s is misconfigured": "Tu %(brand)s tiene un error de configuración",
     "Whether or not you're logged in (we don't record your username)": "Hayas o no iniciado sesión (no guardamos tu nombre de usuario)",
-    "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Uses o no los 'breadcrumbs' (iconos sobre la lista de salas)",
+    "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Uses o no las «migas de pan» (iconos sobre la lista de salas)",
     "Replying With Files": "Respondiendo con archivos",
     "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "En este momento no es posible responder con un archivo. ¿Te gustaría subir el archivo sin responder?",
-    "The file '%(fileName)s' failed to upload.": "Falló en subir el archivo '%(fileName)s'.",
+    "The file '%(fileName)s' failed to upload.": "La subida del archivo '%(fileName)s' ha fallado.",
     "The server does not support the room version specified.": "El servidor no soporta la versión de sala especificada.",
-    "Name or Matrix ID": "Nombre o Matrix ID",
+    "Name or Matrix ID": "Nombre o ID de Matrix",
     "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Añade ¯\\_(ツ)_/¯ al principio de un mensaje de texto plano",
     "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Aviso</b>: Actualizar una sala <i>no migrará automáticamente a sus miembros a la nueva versión de la sala.</i> Incluiremos un enlace a la nueva sala en la versión antigüa de la misma - los miembros tendrán que seguir ese enlace para unirse a la nueva sala.",
     "Changes your display nickname in the current room only": "Cambia tu apodo sólo en la sala actual",
@@ -1129,16 +1129,16 @@
     "Low bandwidth mode": "Modo de ancho de banda bajo",
     "Got It": "Entendido",
     "Scissors": "Tijeras",
-    "Call failed due to misconfigured server": "Llamada fallida debido a la mala configuración del servidor",
+    "Call failed due to misconfigured server": "La llamada ha fallado debido a una mala configuración del servidor",
     "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Por favor, pídele al administrador de tu servidor base (<code>%(homeserverDomain)s</code>) que configure un servidor TURN para que las llamadas funcionen correctamente.",
     "Alternatively, you can try to use the public server at <code>turn.matrix.org</code>, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings.": "Como alternativa, puedes intentar usar el servidor público <code>turn.matrix.org</code>, pero éste no será igual de confiable, y compartirá tu dirección IP con ese servidor. También puedes configurar esto en ajustes.",
-    "Try using turn.matrix.org": "Trata de usar turn.matrix.org",
+    "Try using turn.matrix.org": "Probar usando turn.matrix.org",
     "Messages": "Mensajes",
     "Actions": "Acciones",
     "Other": "Otros",
     "Sends a message as plain text, without interpreting it as markdown": "Envía un mensaje como texto estándar, sin interpretarlo como Markdown",
     "You do not have the required permissions to use this command.": "No tienes los permisos requeridos para usar este comando.",
-    "Changes the avatar of the current room": "Cambia el ávatar de la sala actual",
+    "Changes the avatar of the current room": "Cambia la imagen de la sala actual",
     "Use an identity server": "Usar un servidor de identidad",
     "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "Usar un servidor de identidad para invitar por correo. Presiona continuar par usar el servidor de identidad por defecto (%(defaultIdentityServerName)s) o adminístralo en Ajustes.",
     "Use an identity server to invite by email. Manage in Settings.": "Usar un servidor de identidad para invitar por correo. Gestiónalo en ajustes.",
@@ -1166,10 +1166,10 @@
     "Show previews/thumbnails for images": "Mostrar vistas previas para las imágenes",
     "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!",
+    "This is your list of users/servers you have blocked - don't leave the room!": "Esta es la lista de usuarios y/o servidores que has bloqueado. ¡No te salgas de la sala!",
     "Decline (%(counter)s)": "Declinar (%(counter)s)",
     "Accept <policyLink /> to continue:": "Aceptar <policyLink /> para continuar:",
-    "ID": "Identificación",
+    "ID": "ID",
     "Public Name": "Nombre público",
     "Connecting to integration manager...": "Conectando al gestor de integraciones...",
     "Cannot connect to integration manager": "No se puede conectar al gestor de integraciones",
@@ -1201,10 +1201,10 @@
     "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s actualizó una regla que bloquea a usuarios que coinciden con %(glob)s por %(reason)s",
     "They match": "Coinciden",
     "They don't match": "No coinciden",
-    "To be secure, do this in person or use a trusted way to communicate.": "Para ser seguro, haz esto en persona o usando una forma de comunicación de confianza.",
+    "To be secure, do this in person or use a trusted way to communicate.": "Para mayor seguridad, haz esto en persona o usando una forma de comunicación de confianza.",
     "Lock": "Bloquear",
     "Verify yourself & others to keep your chats safe": "Verifícate y verifica a otros para mantener tus conversaciones seguras",
-    "Other users may not trust it": "Puede que otros usuarios no confíen en ello",
+    "Other users may not trust it": "Puede que otros usuarios no confíen en ella",
     "Upgrade": "Actualizar",
     "Verify": "Verificar",
     "Later": "Más tarde",
@@ -1216,11 +1216,11 @@
     "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Cambiar la contraseña reiniciará cualquier clave de cifrado end-to-end en todas las sesiones, haciendo el historial de conversaciones encriptado ilegible, a no ser que primero exportes tus claves de sala y después las reimportes. En un futuro esto será mejorado.",
     "in memory": "en memoria",
     "not found": "no encontrado",
-    "Identity Server (%(server)s)": "Servidor de Identidad %(server)s",
+    "Identity Server (%(server)s)": "Servidor de identidad %(server)s",
     "You are currently using <server></server> to discover and be discoverable by existing contacts you know. You can change your identity server below.": "Estás usando actualmente <server></server>para descubrir y ser descubierto por contactos existentes que conoces. Puedes cambiar tu servidor de identidad más abajo.",
     "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "Si no quieres usar <server /> para descubrir y ser descubierto por contactos existentes que conoces, introduce otro servidor de identidad más abajo.",
     "Identity Server": "Servidor de Identidad",
-    "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "No estás usando actualmente un servidor de identidad. Para descubrir y ser descubierto por contactos existentes que conoces, introduce uno más abajo.",
+    "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "No estás usando un servidor de identidad ahora mismo. Para descubrir y ser descubierto por contactos existentes que conoces, introduce uno más abajo.",
     "Disconnecting from your identity server will mean you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Desconectarte de tu servidor de identidad significa que no podrás ser descubierto por otros usuarios y no podrás invitar a otros por email o teléfono.",
     "Using an identity server is optional. If you choose not to use an identity server, you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Usar un servidor de identidad es opcional. Si eliges no usar un servidor de identidad, no podrás ser descubierto por otros usuarios y no podrás invitar a otros por email o teléfono.",
     "Do not use an identity server": "No usar un servidor de identidad",
@@ -1234,7 +1234,7 @@
     "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Puede que los siguientes usuarios no existan o sean inválidos, y no pueden ser invitados: %(csvNames)s",
     "Recent Conversations": "Conversaciones recientes",
     "Suggestions": "Sugerencias",
-    "Recently Direct Messaged": "Enviado Mensaje Directo recientemente",
+    "Recently Direct Messaged": "Mensajes directos recientes",
     "Go": "Ir",
     "You've previously used %(brand)s 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, %(brand)s needs to resync your account.": "Has usado %(brand)s anteriormente en %(host)s con carga diferida de usuarios activada. En esta versión la carga diferida está desactivada. Como el caché local no es compatible entre estas dos configuraciones, %(brand)s tiene que resincronizar tu cuenta.",
     "If the other version of %(brand)s is still open in another tab, please close it as using %(brand)s on the same host with both lazy loading enabled and disabled simultaneously will cause issues.": "Si la otra versión de %(brand)s esta todavía abierta en otra pestaña, por favor, ciérrala, ya que usar %(brand)s en el mismo host con la opción de carga diferida activada y desactivada simultáneamente causará problemas.",
@@ -1394,7 +1394,7 @@
     "Send messages": "Enviar mensajes",
     "Invite users": "Invitar usuarios",
     "Change settings": "Cambiar la configuración",
-    "Kick users": "Expulsar usuarios",
+    "Kick users": "Echar usuarios",
     "Ban users": "Bloquear a usuarios",
     "Remove messages": "Eliminar mensajes",
     "Notify everyone": "Notificar a todos",
@@ -1422,17 +1422,17 @@
     "Disconnect from the identity server <idserver />?": "¿Desconectarse del servidor de identidad <idserver />?",
     "Disconnect": "Desconectarse",
     "You should:": "Deberías:",
-    "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.",
+    "Use Single Sign On to continue": "Continuar con SSO",
+    "Confirm adding this email address by using Single Sign On to prove your identity.": "Confirma la nueva dirección de correo usando SSO para probar tu identidad.",
+    "Single Sign On": "Single Sign On",
+    "Confirm adding email": "Confirmar un nuevo correo electrónico",
+    "Click the button below to confirm adding this email address.": "Haz clic en el botón de abajo para confirmar esta nueva 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.",
+    "Confirm adding this phone number by using Single Sign On to prove your identity.": "Confirma el nuevo número de teléfono usando SSO para probar tu identidad.",
+    "Confirm adding phone number": "Confirmar nuevo número de teléfono",
+    "Click the button below to confirm adding this phone number.": "Haz clic en el botón de abajo para confirmar este nuevo número de teléfono.",
     "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Si estés usando %(brand)s en un dispositivo donde una pantalla táctil es el principal mecanismo de entrada",
-    "Whether you're using %(brand)s as an installed Progressive Web App": "Si estás usando %(brand)s como una Aplicación Web Progresiva instalada",
+    "Whether you're using %(brand)s as an installed Progressive Web App": "Si estás usando %(brand)s como una aplicación web progresiva (PWA) instalada",
     "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 inicio de sesión. ¿Has sido tú?",
@@ -1442,7 +1442,7 @@
     "Create Account": "Crear cuenta",
     "Sign In": "Iniciar sesión",
     "Sends a message as html, without interpreting it as markdown": "Envía un mensaje como html, sin interpretarlo en markdown",
-    "Failed to set topic": "No se ha podido establecer el tema",
+    "Failed to set topic": "No se ha podido cambiar el tema",
     "Command failed": "El comando falló",
     "Could not find user in room": "No se ha encontrado 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",
@@ -1457,9 +1457,9 @@
     "%(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.",
+    "Verify your other session using one of the options below.": "Verificar la 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.",
+    "Ask this user to verify their session, or manually verify it below.": "Pídele al usuario que verifique su sesión, o verifícala 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",
@@ -1473,7 +1473,7 @@
     "Send read receipts for messages (requires compatible homeserver to disable)": "Enviar recibos de lectura de mensajes (requiere un servidor local compatible para desactivarlo)",
     "Manually verify all remote sessions": "Verificar 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.",
+    "Verify this session by confirming the following number appears on its screen.": "Verifica 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",
@@ -1503,8 +1503,8 @@
     "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.",
+    "Click the button below to confirm deleting these sessions.|other": "Haz 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": "Haz 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.",
@@ -1525,7 +1525,7 @@
     "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>",
-    "<a>Upgrade</a> to your own domain": "<a>Contratar</a> el uso de un dominio personalizado",
+    "<a>Upgrade</a> to your own domain": "<a>Contratar</a> dominio personalizado",
     "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 ha podido conectar al servidor de identidad",
@@ -1546,7 +1546,7 @@
     "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>.",
+    "Customise your experience with experimental labs features. <a>Learn more</a>.": "Personaliza tu experiencia con funciones experimentales. <a>Más información</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",
@@ -1568,7 +1568,7 @@
     "Accept all %(invitedRooms)s invites": "Aceptar todas las invitaciones de %(invitedRooms)s",
     "Cross-signing": "Firma cruzada",
     "Where you’re logged in": "Sesiones",
-    "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>.",
+    "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Gestiona los nombres de sus sesiones y ciérralas abajo o <a>verifícalas en tu 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>",
@@ -1577,7 +1577,7 @@
     "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.",
+    "Click the link in the email you received to verify and then click continue again.": "Haz clic en el enlace del correo electrónico para verificar, y luego nuevamente haz 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",
@@ -1645,14 +1645,14 @@
     "Create a public room": "Crear una sala pública",
     "Create a private room": "Crear una sala privada",
     "Topic (optional)": "Tema (opcional)",
-    "Make this room public": "Convierte esta sala en pública",
+    "Make this room public": "Haz la sala pública",
     "Hide advanced": "Ocultar ajustes avanzados",
     "Show advanced": "Mostrar ajustes avanzados",
     "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.",
+    "Are you sure you want to deactivate your account? This is irreversible.": "¿Estás seguro de que quieres desactivar su cuenta? No se puede deshacer.",
     "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",
@@ -1660,8 +1660,8 @@
     "Session key": "Código de sesión",
     "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 user will mark their session as trusted, and also mark your session as trusted to them.": "Verificar este usuario marcará su sesión como de confianza, y también marcará tu 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.": "Verifica este dispositivo para marcarlo como confiable. Confiar en este dispositivo te da a ti y a otros usuarios tranquilidad adicional cuando utilizáis 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 te han verificado confiarán en este dispositivo.",
     "Integrations are disabled": "Las integraciones están desactivadas",
     "Enable 'Manage Integrations' in Settings to do this.": "Activa «Gestionar integraciones» en ajustes para hacer esto.",
@@ -1678,23 +1678,23 @@
     "%(brand)s encountered an error during upload of:": "%(brand)s 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 activado, el cifrado de una sala no puede desactivarse. Los mensajes enviados a una sala cifrada no pueden ser vistos por el servidor, solo lo verán los participantes de la sala. Activar el cifrado puede hacer que muchos bots y bridges no funcionen correctamente. <a>Más información sobre el cifrado</a>",
-    "Joining room …": "Uniéndose a sala …",
-    "Loading …": "Cargando …",
-    "Rejecting invite …": "Rechazando invitación …",
+    "Joining room …": "Uniéndote 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",
+    "You were kicked from %(roomName)s by %(memberName)s": "%(memberName)s te ha echado 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",
+    "Re-join": "Volver a entrar",
+    "You were banned from %(roomName)s by %(memberName)s": "%(memberName)s te ha echado 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",
     "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 sala",
     "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 %(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?",
@@ -1712,25 +1712,25 @@
     "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.",
+    "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. No se puede deshacer. ¿Quieres 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. No se puede deshacer. ¿Quieres 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 recargues tu aplicación 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?",
+    "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?": "Desactivar este usuario le cerrará la sesión y desconectará. No podrá volver a iniciar sesión. Además, saldrá de todas las salas a que se había unido. Esta acción no puede deshacerse. ¿Desactivar este usuario?",
     "Deactivate user": "Desactivar usuario",
     "Failed to deactivate user": "Error en desactivar usuario",
     "Remove recent messages": "Eliminar mensajes recientes",
     "Send a reply…": "Enviar una respuesta …",
     "Send a message…": "Enviar un mensaje…",
     "Bold": "Negrita",
-    "Italics": "Cursivo",
+    "Italics": "Cursiva",
     "Strikethrough": "Tachado",
     "Code block": "Bloque de código",
     "Room %(name)s": "Sala %(name)s",
     "Recent rooms": "Salas recientes",
-    "Direct Messages": "Mensaje Directo",
+    "Direct Messages": "Mensajes directos",
     "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",
@@ -1739,7 +1739,7 @@
     "Use an identity server in Settings to receive invites directly in %(brand)s.": "Utilice un servidor de identidad en Configuración para recibir invitaciones directamente en %(brand)s.",
     "Share this email in Settings to receive invites directly in %(brand)s.": "Comparte este correo electrónico en Configuración para recibir invitaciones directamente en %(brand)s.",
     "<userName/> wants to chat": "<userName/> quiere chatear",
-    "Start chatting": "Empieza a chatear",
+    "Start chatting": "Empieza una conversación",
     "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.",
@@ -1760,7 +1760,7 @@
     "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.",
     "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.",
+    "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 dirección local.",
     "Other published addresses:": "Otras direcciones publicadas:",
     "No other published addresses yet, add one below": "Todavía no hay direcciones publicadas, puedes añadir una más abajo",
     "New published address (e.g. #alias:server)": "Nueva dirección publicada (p.ej.. #alias:server)",
@@ -1773,12 +1773,12 @@
     "Accepting…": "Aceptando…",
     "Start Verification": "Iniciar verificación",
     "Messages in this room are end-to-end encrypted.": "Los mensajes de esta sala están cifrados 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.",
+    "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Los mensajes son seguros y sólo tú y el destinatario tienen las claves únicas para desbloquearlos.",
     "Messages in this room are not end-to-end encrypted.": "Los mensajes en esta sala no están cifrados 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 cifradas, tus mensajes están seguros y solo tú 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",
+    "For extra security, verify this user by checking a one-time code on both of your devices.": "Para mayor seguridad, verifica a este usuario comprobando un código temporal vez dos de tus dispositivos.",
+    "Your messages are not secure": "Los mensajes no son seguros",
     "One of the following may be compromised:": "Uno de los siguientes puede estar comprometido:",
     "Your homeserver": "Tu servidor base",
     "The homeserver the user you’re verifying is connected to": "El servidor base del usuario a que está verificando está conectado a",
@@ -1807,15 +1807,15 @@
     "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 cifrar, verificar a todos los usuarios para asegurarse de son seguras.",
     "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!",
+    "You've successfully verified %(displayName)s!": "¡Has verificado con éxito a %(displayName)s!",
     "Verified": "Verificado",
-    "Got it": "Lo he entendido",
+    "Got it": "Aceptar",
     "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.",
+    "You cancelled verification.": "Has cancelado la verificación.",
     "Verification cancelled": "Verificación cancelada",
     "Compare emoji": "Comparar emoji",
     "Encryption enabled": "Cifrado activado",
@@ -1826,33 +1826,33 @@
     "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",
+    "You verified %(name)s": "Has verificado a %(name)s",
+    "You cancelled verifying %(name)s": "Has cancelado la verificación de %(name)s",
     "%(name)s cancelled verifying": "%(name)s canceló la verificación",
-    "You accepted": "Usted aceptó",
+    "You accepted": "Aceptaste",
     "%(name)s accepted": "%(name)s aceptó",
-    "You declined": "Usted declinó",
-    "You cancelled": "Usted canceló",
+    "You declined": "Declinaste",
+    "You cancelled": "Cancelaste",
     "%(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",
+    "You sent a verification request": "Has enviado 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 at %(date)s. Click to view edits.": "Editado el día %(date)s. Haz 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",
+    "Frequently Used": "Frecuente",
     "Smileys & People": "Caritas y personas",
     "Animals & Nature": "Animales y naturaleza",
-    "Food & Drink": "Comidas y bebidas",
+    "Food & Drink": "Comida y bebida",
     "Activities": "Actividades",
     "Travel & Places": "Viajes y lugares",
     "Objects": "Objetos",
@@ -1862,17 +1862,17 @@
     "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 avatar URL": "La URL de tu avatar",
+    "Your user ID": "Tu ID de usuario",
     "Your theme": "Su tema",
     "%(brand)s URL": "URL de %(brand)s",
     "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.",
+    "Widget ID": "ID del widget",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Usar este widget puede resultar en que se compartan 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 que se compartan datos <helpIcon /> con %(widgetDomain)s.",
     "Widgets do not use message encryption.": "Los widgets no utilizan el cifrado de mensajes.",
     "Widget added by": "Widget añadido por",
-    "This widget may use cookies.": "Este widget posiblemente utilice cookies.",
+    "This widget may use cookies.": "Puede que el widget use 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.",
@@ -1883,7 +1883,7 @@
     "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:",
+    "Confirm this user's session by comparing the following with their User Settings:": "Confirma la sesión de este usuario comparando lo siguiente con su configuración:",
     "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 base no parece soportar esta funcionalidad.",
     "Your account is not secure": "Su cuenta no es segura",
@@ -1895,7 +1895,7 @@
     "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 tu servidor base. Si los mensajes en esta sala están cifrados, 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",
-    "Verify other session": "Verifique otra sesión",
+    "Verify other session": "Verificar 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",
@@ -1927,11 +1927,11 @@
     "Resend removal": "Reenviar la eliminación",
     "Share Permalink": "Compartir enlace",
     "Report Content": "Reportar contenido",
-    "Notification settings": "Configuración de notificaciones",
+    "Notification settings": "Notificaciones",
     "Clear status": "Borrar estado",
     "Update status": "Actualizar estado",
-    "Set status": "Establecer estado",
-    "Set a new status...": "Establecer un estado nuevo...",
+    "Set status": "Cambiar estado",
+    "Set a new status...": "Elegir un estado nuevo...",
     "Hide": "Ocultar",
     "Help": "Ayuda",
     "Reload": "Recargar",
@@ -1987,11 +1987,11 @@
     "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.",
+    "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Eres 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 base no permite las comunidades",
-    "Welcome to %(appName)s": "Bienvenido a %(appName)s",
-    "Liberate your communication": "Libere su comunicación",
+    "Welcome to %(appName)s": "Te damos la bienvenida a %(appName)s",
+    "Liberate your communication": "Libera tu 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",
@@ -2005,7 +2005,7 @@
     "The homeserver may be unavailable or overloaded.": "Es posible el servidor de base no esté disponible o esté sobrecargado.",
     "Preview": "Ver",
     "View": "Ver",
-    "Find a room…": "Encuentre una sala…",
+    "Find a room…": "Encuentrar una sala…",
     "Find a room… (e.g. %(exampleRoom)s)": "Encuentra una sala... (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 encuentras la sala que buscas, pide que te inviten a ella o <a>crea una nueva</a>.",
     "Explore rooms": "Explorar salas",
@@ -2014,7 +2014,7 @@
     "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",
+    "Verify this login": "Verificar 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",
@@ -2077,7 +2077,7 @@
     "%(senderName)s changed the room name": "%(senderName)s cambio el nombre de la sala",
     "You invited %(targetName)s": "Has invitado a %(targetName)s",
     "Are you sure you want to cancel entering passphrase?": "¿Estas seguro que quieres cancelar el ingresar tu contraseña de recuperación?",
-    "Go Back": "No cancelar",
+    "Go Back": "Volver",
     "Joins room with given address": "Entrar a la sala con la dirección especificada",
     "Unrecognised room address:": "No se encuentra la dirección de la sala:",
     "Opens chat with the given user": "Abrir una conversación con el usuario especificado",
@@ -2107,7 +2107,7 @@
     "System font name": "Nombre de la fuente",
     "Enable experimental, compact IRC style layout": "Activar el diseño experimental de IRC compacto",
     "Uploading logs": "Subiendo registros",
-    "Downloading logs": "Descargando registro",
+    "Downloading logs": "Descargando registros",
     "Incoming voice call": "Llamada de voz entrante",
     "Incoming video call": "Videollamada entrante",
     "Incoming call": "Llamada entrante",
@@ -2125,16 +2125,16 @@
     "Modern": "Moderno",
     "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "Introduce el nombre de la fuente instalada en tu sistema y %(brand)s intentará utilizarla.",
     "Customise your appearance": "Personaliza la apariencia",
-    "Appearance Settings only affect this %(brand)s session.": "Cambiar las opciones de apariencia solo afecta esta %(brand)s sesión.",
+    "Appearance Settings only affect this %(brand)s session.": "Cambiar las opciones de apariencia solo afecta a esta sesión de %(brand)s.",
     "Please verify the room ID or address and try again.": "Por favor, verifica la ID o dirección de esta sala e inténtalo de nuevo.",
     "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "El administrador del servidor base ha desactivado el cifrado de extremo a extremo en salas privadas y mensajes directos.",
-    "To link to this room, please add an address.": "Para vincular esta sala, por favor añade una dirección.",
+    "To link to this room, please add an address.": "Para obtener un enlace a esta sala, añade una dirección.",
     "The authenticity of this encrypted message can't be guaranteed on this device.": "La autenticidad de este mensaje cifrado no puede ser garantizada en este dispositivo.",
     "No recently visited rooms": "No hay salas visitadas recientemente",
     "People": "Gente",
     "Explore public rooms": "Buscar salas públicas",
     "Can't see what you’re looking for?": "¿No encuentras nada de lo que buscas?",
-    "Explore all public rooms": "Buscar todas las salas publicas",
+    "Explore all public rooms": "Explorar salas públicas",
     "%(count)s results|other": "%(count)s resultados",
     "Prepends ( ͡° ͜ʖ ͡°) to a plain-text message": "Antepone ( ͡° ͜ʖ ͡°) a un mensaje de texto",
     "Group call modified by %(senderName)s": "Llamada grupal modificada por %(senderName)s",
@@ -2204,7 +2204,7 @@
     "You can only pin 2 apps at a time": "Solo puedes anclar 2 aplicaciones a la vez",
     "Message deleted on %(date)s": "Mensaje eliminado el %(date)s",
     "Edited at %(date)s": "Editado el %(date)s",
-    "Click to view edits": "Haga clic para ver las ediciones",
+    "Click to view edits": "Haz clic para ver las ediciones",
     "Categories": "Categorías",
     "Information": "Información",
     "QR Code": "Código QR",
@@ -2222,24 +2222,24 @@
     "Invite people to join %(communityName)s": "Invita a personas a unirse %(communityName)s",
     "There was an error creating your community. The name may be taken or the server is unable to process your request.": "Ha ocurrido un error al crear la comunidad. El nombre puede que ya esté siendo usado o el servidor no puede procesar la solicitud.",
     "Community ID: +<localpart />:%(domain)s": "ID de comunidad: +<localpart />:%(domain)s",
-    "Use this when referencing your community to others. The community ID cannot be changed.": "Use esto cuando haga referencia a su comunidad con otras. La identificación de la comunidad no se puede cambiar.",
+    "Use this when referencing your community to others. The community ID cannot be changed.": "Usa esto cuando hagas referencia a tu comunidad con otras. El ID de la comunidad no se puede cambiar.",
     "You can change this later if needed.": "Puede cambiar esto más tarde si es necesario.",
     "What's the name of your community or team?": "¿Cuál es el nombre de tu comunidad o equipo?",
-    "Enter name": "Ingrese su nombre",
+    "Enter name": "Introduce un nombre",
     "Add image (optional)": "Agregar imagen (opcional)",
     "An image will help people identify your community.": "Una imagen ayudará a las personas a identificar su comunidad.",
     "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone.": "Las salas privadas se pueden encontrar y unirse solo con invitación. Cualquier persona puede encontrar y unirse a las salas públicas.",
     "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone in this community.": "Las salas privadas se pueden encontrar y unirse solo con invitación. Cualquier persona de esta comunidad puede encontrar salas públicas y unirse a ellas.",
-    "You might enable this if the room will only be used for collaborating with internal teams on your homeserver. This cannot be changed later.": "Puede activar esto si la sala solo se usará para colaborar con equipos internos en tu servidor base. Esto no se puede cambiar después.",
+    "You might enable this if the room will only be used for collaborating with internal teams on your homeserver. This cannot be changed later.": "Puedes activar esto si la sala solo se usará para colaborar con equipos internos en tu servidor base. No se puede cambiar después.",
     "You might disable this if the room will be used for collaborating with external teams who have their own homeserver. This cannot be changed later.": "Puedes desactivar esto si la sala se utilizará para colaborar con equipos externos que tengan su propio servidor base. Esto no se puede cambiar después.",
     "Create a room in %(communityName)s": "Crea una sala en %(communityName)s",
-    "Block anyone not part of %(serverName)s from ever joining this room.": "Bloquea a cualquier persona que no sea parte de %(serverName)s para que no se una a esta sala.",
+    "Block anyone not part of %(serverName)s from ever joining this room.": "Evita que cualquier persona que no sea parte de %(serverName)s se una a esta sala.",
     "You've previously used a newer version of %(brand)s with this session. To use this version again with end to end encryption, you will need to sign out and back in again.": "Anteriormente usaste una versión más nueva de %(brand)s con esta sesión. Para volver a utilizar esta versión con cifrado de extremo a extremo, deberá cerrar sesión y volver a iniciar sesión.",
     "There was an error updating your community. The server is unable to process your request.": "Ha ocurrido un error al actualizar tu comunidad. El servidor no puede procesar la solicitud.",
     "Update community": "Actualizar comunidad",
     "To continue, use Single Sign On to prove your identity.": "Para continuar, utilice el inicio de sesión único para demostrar su identidad.",
     "Confirm to continue": "Confirmar para continuar",
-    "Click the button below to confirm your identity.": "Haga clic en el botón de abajo para confirmar su identidad.",
+    "Click the button below to confirm your identity.": "Haz clic en el botón de abajo para confirmar tu identidad.",
     "May include members not in %(communityName)s": "Puede incluir miembros que no están en %(communityName)s",
     "Start a conversation with someone using their name, username (like <userId/>) or email address. This won't invite them to %(communityName)s. To invite someone to %(communityName)s, click <a>here</a>.": "Inicie una conversación con alguien usando su nombre, nombre de usuario (como<userId/>) o dirección de correo electrónico. Esto no los invitará a %(communityName)s Para invitar a alguien a %(communityName)s, haga clic <a>aquí</a>.",
     "You're all caught up.": "Estás al día.",
@@ -2247,7 +2247,7 @@
     "Your server isn't responding to some of your requests. Below are some of the most likely reasons.": "Su servidor no responde a algunas de sus solicitudes. A continuación se presentan algunas de las razones más probables.",
     "The server (%(serverName)s) took too long to respond.": "El servidor (%(serverName)s) tardó demasiado en responder.",
     "Your firewall or anti-virus is blocking the request.": "Tu firewall o antivirus está bloqueando la solicitud.",
-    "A browser extension is preventing the request.": "Una extensión del navegador está impidiendo que se haga la solicitud.",
+    "A browser extension is preventing the request.": "Una extensión del navegador está impidiendo la solicitud.",
     "The server is offline.": "El servidor está desconectado.",
     "The server has denied your request.": "El servidor ha rechazado la solicitud.",
     "Your area is experiencing difficulties connecting to the internet.": "Su área está experimentando dificultades para conectarse a Internet.",
@@ -2269,7 +2269,7 @@
     "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use %(brand)s with an existing Matrix account on a different homeserver.": "Puede utilizar las opciones del servidor personalizado para iniciar sesión en otros servidores Matrix especificando una URL de servidor principal diferente. Esto le permite utilizar %(brand)s con una cuenta Matrix existente en un servidor doméstico diferente.",
     "Enter the location of your Element Matrix Services homeserver. It may use your own domain name or be a subdomain of <a>element.io</a>.": "Ingrese la ubicación de su servidor doméstico de Element Matrix Services. Puede usar su propio nombre de dominio o ser un subdominio de <a>element.io</a>.",
     "No files visible in this room": "No hay archivos visibles en esta sala",
-    "Attach files from chat or just drag and drop them anywhere in a room.": "Adjunte archivos desde el chat o simplemente arrástrelos y suéltelos en cualquier lugar de una sala.",
+    "Attach files from chat or just drag and drop them anywhere in a room.": "Adjunta archivos desde el chat o simplemente arrástralos y suéltalos en cualquier lugar de una sala.",
     "You’re all caught up": "Estás al día",
     "You have no visible notifications in this room.": "No tienes notificaciones visibles en esta sala.",
     "Delete the room address %(alias)s and remove %(name)s from the directory?": "¿Eliminar la dirección de la sala %(alias)s y eliminar %(name)s del directorio?",
@@ -2278,7 +2278,7 @@
     "Search rooms": "Buscar salas",
     "Create community": "Crear comunidad",
     "Failed to find the general chat for this community": "No se pudo encontrar el chat general de esta comunidad",
-    "Security & privacy": "Seguridad y Privacidad",
+    "Security & privacy": "Seguridad y privacidad",
     "All settings": "Todos los ajustes",
     "Feedback": "Realimentación",
     "Community settings": "Configuración de la comunidad",
@@ -2310,7 +2310,7 @@
     "%(brand)s iOS": "%(brand)s iOS",
     "%(brand)s Android": "%(brand)s Android",
     "or another cross-signing capable Matrix client": "u otro cliente Matrix con capacidad de firma cruzada",
-    "Without completing security on this session, it won’t have access to encrypted messages.": "Sin completar la seguridad en esta sesión, no tendrá acceso a los mensajes cifrados.",
+    "Without completing security on this session, it won’t have access to encrypted messages.": "Al no completar la seguridad en esta sesión, no tendrás acceso a los mensajes cifrados.",
     "Failed to re-authenticate due to a homeserver problem": "No ha sido posible volver a autenticarse debido a un problema con el servidor base",
     "Failed to re-authenticate": "No se pudo volver a autenticar",
     "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.": "Recupere el acceso a su cuenta y recupere las claves de cifrado almacenadas en esta sesión. Sin ellos, no podrá leer todos sus mensajes seguros en ninguna sesión.",
@@ -2329,7 +2329,7 @@
     "Room Autocomplete": "Autocompletar sala",
     "User Autocomplete": "Autocompletar de usuario",
     "Confirm encryption setup": "Confirmar la configuración de cifrado",
-    "Click the button below to confirm setting up encryption.": "Haga clic en el botón de abajo para confirmar la configuración del cifrado.",
+    "Click the button below to confirm setting up encryption.": "Haz clic en el botón de abajo para confirmar la configuración del cifrado.",
     "Safeguard against losing access to encrypted messages & data by backing up encryption keys on your server.": "Protéjase contra la pérdida de acceso a los mensajes y datos cifrados haciendo una copia de seguridad de las claves de cifrado en su servidor.",
     "Generate a Security Key": "Generar una llave de seguridad",
     "We’ll generate a Security Key for you to store somewhere safe, like a password manager or a safe.": "Generaremos una llave de seguridad para que la guardes en un lugar seguro, como un administrador de contraseñas o una caja fuerte.",
@@ -2752,7 +2752,7 @@
     "Active Widgets": "Widgets activos",
     "This version of %(brand)s does not support viewing some encrypted files": "Esta versión de %(brand)s no permite ver algunos archivos cifrados",
     "Use the <a>Desktop app</a> to search encrypted messages": "Usa la <a>aplicación de ordenador</a> para buscar en los mensajes cifrados",
-    "Use the <a>Desktop app</a> to see all encrypted files": "Usar la <a>aplicación de ordenador</a> para ver todos los archivos cifrados",
+    "Use the <a>Desktop app</a> to see all encrypted files": "Usa la <a>aplicación de ordenador</a> para ver todos los archivos cifrados",
     "Video conference started by %(senderName)s": "Videoconferencia iniciada por %(senderName)s",
     "Video conference updated by %(senderName)s": "Videoconferencia actualizada por %(senderName)s",
     "You held the call <a>Resume</a>": "Has puesto la llamada en espera <a>Recuperar</a>",
@@ -2943,5 +2943,88 @@
     "Answered Elsewhere": "Respondida en otra parte",
     "The call could not be established": "No se ha podido establecer la llamada",
     "The other party declined the call.": "La otra persona ha rechazado la llamada.",
-    "Call Declined": "Llamada rechazada"
+    "Call Declined": "Llamada rechazada",
+    "Your Security Key is a safety net - you can use it to restore access to your encrypted messages if you forget your Security Phrase.": "Tu clave de seguridad es una red de seguridad. Puedes usarla para volver a tener acceso a tus mensajes cifrados si te olvidas de tu frase de seguridad.",
+    "We'll store an encrypted copy of your keys on our server. Secure your backup with a Security Phrase.": "Almacenaremos una copia cifrada de tus claves en nuestros servidores. Asegura tu copia de seguridad con una frase de seguridad.",
+    "<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 add images with Matrix URLs <img src=\"mxc://url\" />\n</p>\n": "<h1>HTML para tu página de comunidad</h1>\n<p>\n\tUsa la descripción extendida para presentar la comunidad a nuevos participantes, o difunde\n\t<a href=\"foo\">enlaces</a> importantes\n</p>\n<p>\n\tPuedes incluso añadir imágenes con direcciones URL de Matrix <img src=\"mxc://url\" />\n</p>\n",
+    "If you've forgotten your Security Key you can <button>set up new recovery options</button>": "Si te has olvidado de tu clave de seguridad puedes <button>configurar nuevos métodos de recuperación</button>",
+    "Access your secure message history and set up secure messaging by entering your Security Key.": "Accede a tu historial de mensajes seguros y configúralos introduciendo tu clave de seguridad.",
+    "If you've forgotten your Security Phrase you can <button1>use your Security Key</button1> or <button2>set up new recovery options</button2>": "Si has olvidado tu frase de seguridad puedes usar tu <button1>clave de seguridad</button1> o <button2>configurar nuevos métodos de recuperación</button2>",
+    "Access your secure message history and set up secure messaging by entering your Security Phrase.": "Accede a tu historia de mensajes seguros o configúralos escribiendo tu frase de seguridad.",
+    "Backup could not be decrypted with this Security Phrase: please verify that you entered the correct Security Phrase.": "No se ha podido descifrar la copia de seguridad con esa frase. Por favor, comprueba que hayas escrito bien la frase de seguridad.",
+    "Set up with a Security Key": "Configurar una clave de seguridad",
+    "Backup could not be decrypted with this Security Key: please verify that you entered the correct Security Key.": "La copia de seguridad no se ha podido descifrar con esta clave: por favor, comprueba que la que has introducido es correcta.",
+    "Security Key mismatch": "Las claves de seguridad no coinciden",
+    "Invite someone using their name, username (like <userId/>) or <a>share this room</a>.": "Invita a alguien usando su nombre, nombre de usuario (ej.: <userId/>) o <a>compartiendo esta sala</a>.",
+    "Only the two of you are in this conversation, unless either of you invites anyone to join.": "En esta conversación no hay nadie más, hasta que uno de los dos invite a alguien.",
+    "Are you sure you wish to abort creation of the host? The process cannot be continued.": "¿Seguro que quieres cancelar la creación del host? El proceso no podrá continuarse.",
+    "Use email or phone to optionally be discoverable by existing contacts.": "Usa tu correo electrónico o teléfono para que, opcionalmente, tus contactos puedan descubrir tu cuenta.",
+    "Enter Security Key": "Introduce la clave de seguridad",
+    "Unable to access secret storage. Please verify that you entered the correct Security Phrase.": "No se ha podido acceder al almacenamiento seguro. Por favor, comprueba que la frase de seguridad es correcta.",
+    "Just a heads up, if you don't add an email and forget your password, you could <b>permanently lose access to your account</b>.": "Ten en cuenta que, si no añades un correo electrónico y olvidas tu contraseña, podrías <b>perder accceso para siempre a tu cuenta</b>.",
+    "We recommend you change your password and Security Key in Settings immediately": "Te recomendamos que cambies tu contraseña y clave de seguridad en ajustes inmediatamente",
+    "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.": "Invitar a alguien usando su nombre, dirección de correo, nombre de usuario (ej.: <userId/>) o <a>compartiendo esta sala</a>.",
+    "This won't invite them to %(communityName)s. To invite someone to %(communityName)s, click <a>here</a>": "Esto no les invitará a %(communityName)s. Para invitar a alguien a %(communityName)s, haz clic <a>aquí</a>",
+    "Continuing temporarily allows the %(hostSignupBrand)s setup process to access your account to fetch verified email addresses. This data is not stored.": "Al continuar con el proceso de configuración, %(hostSignupBrand)s podrá acceder a tu cuenta para comprobar las direcciones de correo verificadas. Los datos no se almacenan.",
+    "Failed to connect to your homeserver. Please close this dialog and try again.": "No se ha podido conectar con tu servidor base. Por favor, cierra este mensaje e inténtalo de nuevo.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "Guardar mensajes cifrados de forma segura y local para que aparezcan en los resultados de búsqueda, usando %(size)s para almacenar mensajes de %(rooms)s sala.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "Guardar mensajes cifrados de forma segura y local para que aparezcan en los resultados de búsqueda, usando %(size)s para almacenar mensajes de %(rooms)s salas.",
+    "Offline encrypted messaging using dehydrated devices": "Mensajería cifrada y offline usando dispositivos deshidratados",
+    "Send <b>%(msgtype)s</b> messages as you in your active room": "Enviar mensajes de tipo <b>%(msgtype)s</b> en tu nombre a tu sala activa",
+    "Send <b>%(msgtype)s</b> messages as you in this room": "Enviar mensajes de tipo <b>%(msgtype)s</b> en tu nombre a esta sala",
+    "See general files posted to your active room": "Ver archivos enviados a tu sala activa",
+    "See general files posted to this room": "Ver archivos enviados a esta sala",
+    "Send general files as you in your active room": "Enviar archivos en tu nombre a tu sala activa",
+    "See videos posted to your active room": "Ver los vídeos publicados a tu sala activa",
+    "Send videos as you in your active room": "Enviar vídeos en tu nombre a tu sala activa",
+    "See images posted to your active room": "Ver las imágenes enviadas a tu sala activa",
+    "Send images as you in your active room": "Enviar imágenes en tu nombre a tu sala activa",
+    "See emotes posted to your active room": "Ver las reacciones publicadas en tu sala activa",
+    "Send emotes as you in your active room": "Reaccionar en tu nombre a tu sala activa",
+    "See <b>%(eventType)s</b> events posted to your active room": "Ver los eventos de tipo <b>%(eventType)s</b> publicados en tu sala activa",
+    "Send stickers to your active room as you": "Enviar etiquetas a tu sala activa en tu nombre",
+    "Start a conversation with someone using their name or username (like <userId/>).": "Empieza una conversación con alguien usando su nombre o nombre de usuario (como <userId/>).",
+    "Start a conversation with someone using their name, email address or username (like <userId/>).": "Empieza una conversación con alguien usando su nombre, correo electrónico o nombre de usuario (como <userId/>).",
+    "Minimize dialog": "Minimizar",
+    "Maximize dialog": "Maximizar",
+    "See <b>%(msgtype)s</b> messages posted to your active room": "Ver mensajes de tipo <b>%(msgtype)s</b> enviados a tu sala activa",
+    "See <b>%(msgtype)s</b> messages posted to this room": "Ver mensajes de tipo <b>%(msgtype)s</b> enviados a esta sala",
+    "Show chat effects (animations when receiving e.g. confetti)": "Mostrar efectos de chat (animaciones al recibir ciertos mensajes, como confeti)",
+    "Expand code blocks by default": "Expandir bloques de ćodigo por defecto",
+    "Learn more in our <privacyPolicyLink />, <termsOfServiceLink /> and <cookiePolicyLink />.": "Más información en nuestra <privacyPolicyLink />, <termsOfServiceLink /> y <cookiePolicyLink />.",
+    "Cookie Policy": "Política de cookies",
+    "Privacy Policy": "Política de privacidad",
+    "%(hostSignupBrand)s Setup": "Configuración de %(hostSignupBrand)s",
+    "You should know": "Conviene saber",
+    "Upgrade to %(hostSignupBrand)s": "Contratar %(hostSignupBrand)s",
+    "Show line numbers in code blocks": "Mostrar números de línea en bloques de ćodigo",
+    "This is the beginning of your direct message history with <displayName/>.": "Este es el inicio de tu historial de mensajes directos con <displayName/>.",
+    "Recently visited rooms": "Salas visitadas recientemente",
+    "Abort": "Cancelar",
+    "Confirm abort of host creation": "Confirma que quieres cancelar la creación del host",
+    "PRO TIP: If you start a bug, please submit <debugLogsLink>debug logs</debugLogsLink> to help us track down the problem.": "CONSEJO: Si creas una incidencia, adjunta <debugLogsLink>tus registros de depuración</debugLogsLink> para ayudarnos a localizar el problema.",
+    "Please view <existingIssuesLink>existing bugs on Github</existingIssuesLink> first. No match? <newIssueLink>Start a new one</newIssueLink>.": "Por favor, echa un vistazo a <existingIssuesLink>las incidenias de Github</existingIssuesLink> primero. Si no encuentras nada relacionado, <newIssueLink>crea una nueva</newIssueLink>.",
+    "Edit Values": "Editar valores",
+    "Values at explicit levels in this room:": "Valores a niveles explícitos en esta sala:",
+    "Values at explicit levels:": "Valores a niveles explícitos:",
+    "Value in this room:": "Valor en esta sala:",
+    "Value:": "Valor:",
+    "Save setting values": "Guardar valores de ajustes",
+    "Values at explicit levels in this room": "Valores a niveles explícitos en esta sala",
+    "Values at explicit levels": "Valores a niveles explícitos",
+    "Settable at room": "Establecible a nivel de sala",
+    "Settable at global": "Establecible globalmente",
+    "Level": "Nivel",
+    "Setting definition:": "Definición del ajuste:",
+    "This UI does NOT check the types of the values. Use at your own risk.": "Esta interfaz NO comprueba los tipos de dato de los valores. Usar bajo tu responsabilidad.",
+    "Caution:": "Precaución:",
+    "Setting:": "Ajuste:",
+    "Value in this room": "Valor en esta sala",
+    "Value": "Valor",
+    "Setting ID": "ID de ajuste",
+    "Failed to save settings": "No se han podido guardar los ajustes",
+    "Settings Explorer": "Explorador de ajustes",
+    "Windows": "Ventanas",
+    "Share your screen": "Compartir pantalla",
+    "Screens": "Pantallas"
 }

From 9d65f0ca41ff0431301036d2c4e41e3ac9fdf6f7 Mon Sep 17 00:00:00 2001
From: Thibault Martin <mail@thibaultmart.in>
Date: Fri, 5 Mar 2021 21:31:18 +0000
Subject: [PATCH 183/420] Translated using Weblate (French)

Currently translated at 100.0% (2780 of 2780 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fr/
---
 src/i18n/strings/fr.json | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 3d024f6e18..e170ec1414 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -3043,5 +3043,27 @@
     "Your homeserver was unreachable and was not able to log you in. Please try again. If this continues, please contact your homeserver administrator.": "Votre serveur d’accueil n’est pas accessible, nous n’avons pas pu vous connecter. Merci de réessayer. Si cela persiste, merci de contacter l’administrateur de votre serveur d’accueil.",
     "Try again": "Réessayez",
     "We asked the browser to remember which homeserver you use to let you sign in, but unfortunately your browser has forgotten it. Go to the sign in page and try again.": "Nous avons demandé à votre navigateur de mémoriser votre serveur d’accueil, mais il semble l’avoir oublié. Rendez-vous à la page de connexion et réessayez.",
-    "We couldn't log you in": "Impossible de vous déconnecter"
+    "We couldn't log you in": "Impossible de vous déconnecter",
+    "Upgrade to %(hostSignupBrand)s": "Mettre à jour vers %(hostSignupBrand)s",
+    "Edit Values": "Modifier les valeurs",
+    "Values at explicit levels in this room:": "Valeurs pour les rangs explicites de ce salon :",
+    "Values at explicit levels:": "Valeurs pour les rangs explicites :",
+    "Value in this room:": "Valeur pour ce salon :",
+    "Value:": "Valeur :",
+    "Save setting values": "Enregistrer les valeurs des paramètres",
+    "Values at explicit levels in this room": "Valeurs pour des rangs explicites dans ce salon",
+    "Values at explicit levels": "Valeurs pour des rangs explicites",
+    "Settable at room": "Définissable par salon",
+    "Settable at global": "Définissable de manière globale",
+    "Level": "Rang",
+    "Setting definition:": "Définition du paramètre :",
+    "This UI does NOT check the types of the values. Use at your own risk.": "Cette interface ne vérifie pas les types des valeurs. Utilisez la à vos propres risques.",
+    "Caution:": "Attention :",
+    "Setting:": "Paramètre :",
+    "Value in this room": "Valeur pour ce salon",
+    "Value": "Valeur",
+    "Setting ID": "Identifiant de paramètre",
+    "Failed to save settings": "Échec lors de la sauvegarde des paramètres",
+    "Settings Explorer": "Explorateur de paramètres",
+    "Show chat effects (animations when receiving e.g. confetti)": "Afficher les animations de conversation (animations lors de la réception par ex. de confettis)"
 }

From 49c40e662ce40ba2f967708e07e92579a37de7e6 Mon Sep 17 00:00:00 2001
From: Roel ter Maat <roel.termaat@nedap.com>
Date: Tue, 2 Mar 2021 21:10:34 +0000
Subject: [PATCH 184/420] Translated using Weblate (Dutch)

Currently translated at 100.0% (2780 of 2780 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
---
 src/i18n/strings/nl.json | 48 ++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 0d80e520c8..db3255c051 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -165,7 +165,7 @@
     "Failed to set display name": "Instellen van weergavenaam is mislukt",
     "Failed to unban": "Ontbannen mislukt",
     "Failed to upload profile picture!": "Uploaden van profielfoto is mislukt!",
-    "Failed to verify email address: make sure you clicked the link in the email": "Kan het e-mailadres niet verifiëren: zorg ervoor dat u de koppeling in de e-mail heeft aangeklikt",
+    "Failed to verify email address: make sure you clicked the link in the email": "Kan het e-mailadres niet verifiëren: zorg ervoor dat je de koppeling in de e-mail hebt aangeklikt",
     "Failure to create room": "Aanmaken van gesprek is mislukt",
     "Favourites": "Favorieten",
     "Fill screen": "Scherm vullen",
@@ -240,7 +240,7 @@
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s heeft %(targetDisplayName)s in het gesprek uitgenodigd.",
     "Server error": "Serverfout",
     "Server may be unavailable, overloaded, or search timed out :(": "De server is misschien onbereikbaar of overbelast, of het zoeken duurde te lang :(",
-    "Server may be unavailable, overloaded, or you hit a bug.": "De server is misschien onbereikbaar of overbelast, of u bent een fout tegengekomen.",
+    "Server may be unavailable, overloaded, or you hit a bug.": "De server is misschien onbereikbaar of overbelast, of je bent een fout tegengekomen.",
     "Server unavailable, overloaded, or something else went wrong.": "De server is onbereikbaar of overbelast, of er is iets anders foutgegaan.",
     "Session ID": "Sessie-ID",
     "%(senderName)s kicked %(targetName)s.": "%(senderName)s heeft %(targetName)s het gesprek uitgestuurd.",
@@ -304,8 +304,8 @@
     "Who can read history?": "Wie kan de geschiedenis lezen?",
     "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s heeft de uitnodiging van %(targetName)s ingetrokken.",
     "You are already in a call.": "U bent al in gesprek.",
-    "You cannot place a call with yourself.": "U kunt uzelf niet bellen.",
-    "You cannot place VoIP calls in this browser.": "U kunt in deze browser geen VoIP-oproepen plegen.",
+    "You cannot place a call with yourself.": "Je kunt jezelf niet bellen.",
+    "You cannot place VoIP calls in this browser.": "Je kunt in deze browser geen VoIP-oproepen plegen.",
     "You do not have permission to post to this room": "U heeft geen toestemming actief aan dit gesprek deel te nemen",
     "You have <a>disabled</a> URL previews by default.": "U heeft URL-voorvertoningen standaard <a>uitgeschakeld</a>.",
     "You have <a>enabled</a> URL previews by default.": "U heeft URL-voorvertoningen standaard <a>ingeschakeld</a>.",
@@ -420,7 +420,7 @@
     "Which rooms would you like to add to this community?": "Welke gesprekken wilt u toevoegen aan deze gemeenschap?",
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Widgets verwijderen geldt voor alle deelnemers aan dit gesprek. Weet u zeker dat u deze widget wilt verwijderen?",
     "Delete Widget": "Widget verwijderen",
-    "Who would you like to add to this community?": "Wie wilt u toevoegen aan deze gemeenschap?",
+    "Who would you like to add to this community?": "Wie wil je toevoegen aan deze gemeenschap?",
     "Invite to Community": "Uitnodigen tot gemeenschap",
     "Show these rooms to non-members on the community page and room list?": "Deze gesprekken tonen aan niet-leden op de gemeenschapspagina en gesprekslijst?",
     "Add rooms to the community": "Voeg gesprekken toe aan de gemeenschap",
@@ -628,12 +628,12 @@
     "Room Notification": "Groepsgespreksmelding",
     "The information being sent to us to help make %(brand)s better includes:": "De informatie die naar ons wordt verstuurd om %(brand)s te verbeteren bevat:",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Waar deze pagina identificeerbare informatie bevat, zoals een gespreks-, gebruikers- of groeps-ID, zullen deze gegevens verwijderd worden voordat ze naar de server gestuurd worden.",
-    "The platform you're on": "Het platform dat u gebruikt",
+    "The platform you're on": "Het platform dat je gebruikt",
     "The version of %(brand)s": "De versie van %(brand)s",
-    "Your language of choice": "De door u gekozen taal",
-    "Which officially provided instance you are using, if any": "Welke officieel aangeboden instantie u eventueel gebruikt",
-    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Of u de tekstverwerker al dan niet in de modus voor opgemaakte tekst gebruikt",
-    "Your homeserver's URL": "De URL van uw homeserver",
+    "Your language of choice": "De door jou gekozen taal",
+    "Which officially provided instance you are using, if any": "Welke officieel aangeboden instantie je eventueel gebruikt",
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Of je de tekstverwerker al dan niet in de modus voor opgemaakte tekst gebruikt",
+    "Your homeserver's URL": "De URL van je homeserver",
     "<a>In reply to</a> <pill>": "<a>Als antwoord op</a> <pill>",
     "This room is not public. You will not be able to rejoin without an invite.": "Dit is geen openbaar gesprek. Slechts op uitnodiging zult u opnieuw kunnen toetreden.",
     "were unbanned %(count)s times|one": "zijn ontbannen",
@@ -783,9 +783,9 @@
     "Failed to send logs: ": "Versturen van logboeken mislukt: ",
     "Preparing to send logs": "Logboeken worden voorbereid voor versturen",
     "e.g. %(exampleValue)s": "bv. %(exampleValue)s",
-    "Every page you use in the app": "Iedere bladzijde die u in de toepassing gebruikt",
+    "Every page you use in the app": "Iedere bladzijde die je in de toepassing gebruikt",
     "e.g. <CurrentPageURL>": "bv. <CurrentPageURL>",
-    "Your device resolution": "De resolutie van uw apparaat",
+    "Your device resolution": "De resolutie van je apparaat",
     "Missing roomId.": "roomId ontbreekt.",
     "Always show encryption icons": "Versleutelingspictogrammen altijd tonen",
     "Send analytics data": "Statistische gegevens versturen",
@@ -813,7 +813,7 @@
     "A call is currently being placed!": "Er wordt al een oproep gemaakt!",
     "A call is already in progress!": "Er is al een gesprek actief!",
     "Permission Required": "Toestemming vereist",
-    "You do not have permission to start a conference call in this room": "U heeft geen toestemming in dit groepsgesprek een vergadergesprek te starten",
+    "You do not have permission to start a conference call in this room": "Je hebt geen toestemming in dit groepsgesprek een vergadergesprek te starten",
     "This event could not be displayed": "Deze gebeurtenis kon niet weergegeven worden",
     "Demote yourself?": "Uzelf degraderen?",
     "Demote": "Degraderen",
@@ -842,9 +842,9 @@
     "Bulk options": "Bulkopties",
     "This homeserver has hit its Monthly Active User limit.": "Deze homeserver heeft zijn limiet voor maandelijks actieve gebruikers bereikt.",
     "This homeserver has exceeded one of its resource limits.": "Deze homeserver heeft één van zijn systeembronlimieten overschreden.",
-    "Whether or not you're logged in (we don't record your username)": "Of u al dan niet ingelogd bent (we slaan uw gebruikersnaam niet op)",
+    "Whether or not you're logged in (we don't record your username)": "Of je al dan niet ingelogd bent (we slaan je gebruikersnaam niet op)",
     "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Het bestand ‘%(fileName)s’ is groter dan de uploadlimiet van de homeserver",
-    "Unable to load! Check your network connectivity and try again.": "Laden mislukt! Controleer uw netwerktoegang en probeer het nogmaals.",
+    "Unable to load! Check your network connectivity and try again.": "Laden mislukt! Controleer je netwerktoegang en probeer het nogmaals.",
     "Failed to invite users to the room:": "Kon de volgende gebruikers hier niet uitnodigen:",
     "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Plakt ¯\\_(ツ)_/¯ vóór een bericht zonder opmaak",
     "Upgrades a room to a new version": "Actualiseert het gesprek tot een nieuwe versie",
@@ -1255,9 +1255,9 @@
     "The homeserver may be unavailable or overloaded.": "De homeserver is mogelijk onbereikbaar of overbelast.",
     "You have %(count)s unread notifications in a prior version of this room.|other": "U heeft %(count)s ongelezen meldingen in een vorige versie van dit gesprek.",
     "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",
+    "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Of je 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?": "Het is momenteel niet mogelijk 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. Wil je 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",
@@ -1433,8 +1433,8 @@
     "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 uw homeserverbeheerder (<code>%(homeserverDomain)s</code>) een TURN-server te configureren voor de betrouwbaarheid van de oproepen.",
-    "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.",
+    "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Vraag je homeserverbeheerder (<code>%(homeserverDomain)s</code>) een TURN-server te configureren voor de betrouwbaarheid van de oproepen.",
+    "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.": "Je 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. Je 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 homeserver er geen aanbiedt (uw IP-adres wordt gedeeld gedurende een oproep)",
     "Identity server has no terms of service": "De identiteitsserver heeft geen dienstvoorwaarden",
@@ -1636,9 +1636,9 @@
     "Unable to load session list": "Kan sessielijst niet laden",
     "Delete %(count)s sessions|other": "%(count)s sessies verwijderen",
     "Delete %(count)s sessions|one": "%(count)s sessie verwijderen",
-    "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Of u %(brand)s op een apparaat gebruikt waarop een aanraakscherm de voornaamste invoermethode is",
-    "Whether you're using %(brand)s as an installed Progressive Web App": "Of u %(brand)s gebruikt als een geïnstalleerde Progressive-Web-App",
-    "Your user agent": "Uw gebruikersagent",
+    "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Of je %(brand)s op een apparaat gebruikt waarop een aanraakscherm de voornaamste invoermethode is",
+    "Whether you're using %(brand)s as an installed Progressive Web App": "Of je %(brand)s gebruikt als een geïnstalleerde Progressive-Web-App",
+    "Your user agent": "Jouw gebruikersagent",
     "If you cancel now, you won't complete verifying the other user.": "Als u nu annuleert zult u de andere gebruiker niet verifiëren.",
     "If you cancel now, you won't complete verifying your other session.": "Als u nu annuleert zult u uw andere sessie niet verifiëren.",
     "Cancel entering passphrase?": "Wachtwoordinvoer annuleren?",
@@ -1973,11 +1973,11 @@
     "Where you’re logged in": "Waar u ingelogd 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>.",
     "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 uw eenmalige aanmelding om dit e-mailadres toe te voegen.",
+    "Confirm adding this email address by using Single Sign On to prove your identity.": "Bevestig je identiteit met je eenmalige aanmelding om dit e-mailadres 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 uw eenmalige aanmelding om dit telefoonnummer toe te voegen.",
+    "Confirm adding this phone number by using Single Sign On to prove your identity.": "Bevestig je identiteit met je 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.",
     "If you cancel now, you won't complete your operation.": "Als u de operatie afbreekt kunt u haar niet voltooien.",

From 592bd427a5995fe61b24b9ea40c1931c55eef015 Mon Sep 17 00:00:00 2001
From: Ihor Hordiichuk <igor_ck@outlook.com>
Date: Mon, 1 Mar 2021 21:11:40 +0000
Subject: [PATCH 185/420] Translated using Weblate (Ukrainian)

Currently translated at 53.6% (1492 of 2780 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/uk/
---
 src/i18n/strings/uk.json | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json
index adb830c123..5f392295c3 100644
--- a/src/i18n/strings/uk.json
+++ b/src/i18n/strings/uk.json
@@ -325,7 +325,7 @@
     "Displays action": "Відбиває дію",
     "Reason": "Причина",
     "%(senderName)s requested a VoIP conference.": "%(senderName)s бажає розпочати дзвінок-конференцію.",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s запросив/ла %(targetName)s.",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s запрошує %(targetName)s.",
     "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s змінює своє видиме ім'я на %(displayName)s.",
     "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s зазначив(-ла) своє видиме ім'я: %(displayName)s.",
     "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s видалив(-ла) своє видиме ім'я (%(oldDisplayName)s).",
@@ -1164,7 +1164,7 @@
     "Show hidden events in timeline": "Показувати приховані події у часоряді",
     "Show previews/thumbnails for images": "Показувати попередній перегляд зображень",
     "Compare a unique set of emoji if you don't have a camera on either device": "Порівняйте унікальну низку емодзі якщо ви не маєте камери на жодному пристрої",
-    "Confirm the emoji below are displayed on both sessions, in the same order:": "Підтвердьте, що нижчевказані емодзі відбиваються в обох сеансах в однаковому порядку:",
+    "Confirm the emoji below are displayed on both sessions, in the same order:": "Підтвердьте, що емодзі внизу показано в обох сеансах в однаковому порядку:",
     "Verify this user by confirming the following emoji appear on their screen.": "Звірте цього користувача підтвердженням того, що наступні емодзі з'являються на його екрані.",
     "Emoji picker": "Обирач емодзі",
     "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what %(brand)s supports. Try with a different client.": "Сеанс, який ви намагаєтесь звірити, не підтримує сканування QR-коду або звіряння за допомогою емодзі, що є підтримувані %(brand)s. Спробуйте використати інший клієнт.",
@@ -1597,5 +1597,8 @@
     "Enable encryption?": "Увімкнути шифрування?",
     "Enable room encryption": "Увімкнути шифрування кімнати",
     "Encryption": "Шифрування",
-    "Try again": "Спробувати ще раз"
+    "Try again": "Спробувати ще раз",
+    "%(creator)s created this DM.": "%(creator)s створює цю приватну розмову.",
+    "Share Link to User": "Поділитися посиланням на користувача",
+    "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.": "Повідомлення тут захищено наскрізним шифруванням. Підтвердьте %(displayName)s у їхньому профілі — натиснувши на їх аватар."
 }

From ca729d35aa90eb55b908dd4101768f44d7589701 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Tue, 2 Mar 2021 12:00:40 +0000
Subject: [PATCH 186/420] Translated using Weblate (Italian)

Currently translated at 100.0% (2780 of 2780 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-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 2764863e77..3e5ad9296b 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -3065,5 +3065,27 @@
     "Recently visited rooms": "Stanze visitate di recente",
     "Show line numbers in code blocks": "Mostra numeri di riga nei blocchi di codice",
     "Expand code blocks by default": "Espandi blocchi di codice in modo predefinito",
-    "Show stickers button": "Mostra pulsante adesivi"
+    "Show stickers button": "Mostra pulsante adesivi",
+    "Upgrade to %(hostSignupBrand)s": "Aggiorna a %(hostSignupBrand)s",
+    "Edit Values": "Modifica valori",
+    "Values at explicit levels in this room:": "Valori a livelli espliciti in questa stanza:",
+    "Values at explicit levels:": "Valori a livelli espliciti:",
+    "Value in this room:": "Valore in questa stanza:",
+    "Value:": "Valore:",
+    "Save setting values": "Salva valori impostazione",
+    "Values at explicit levels in this room": "Valori a livelli espliciti in questa stanza",
+    "Values at explicit levels": "Valori a livelli espliciti",
+    "Settable at room": "Impostabile per stanza",
+    "Settable at global": "Impostabile globalmente",
+    "Level": "Livello",
+    "Setting definition:": "Definizione impostazione:",
+    "This UI does NOT check the types of the values. Use at your own risk.": "Questa interfaccia NON controlla i tipi dei valori. Usa a tuo rischio.",
+    "Caution:": "Attenzione:",
+    "Setting:": "Impostazione:",
+    "Value in this room": "Valore in questa stanza",
+    "Value": "Valore",
+    "Setting ID": "ID impostazione",
+    "Failed to save settings": "Impossibile salvare le impostazioni",
+    "Settings Explorer": "Esploratore di impostazioni",
+    "Show chat effects (animations when receiving e.g. confetti)": "Mostra effetti chat (animazioni quando si ricevono ad es. coriandoli)"
 }

From 6b098a2bafbf49acea769a17be976370c067cfbd Mon Sep 17 00:00:00 2001
From: Kaede <contact+element_translations@kaede.ch>
Date: Tue, 2 Mar 2021 06:04:12 +0000
Subject: [PATCH 187/420] Translated using Weblate (Japanese)

Currently translated at 50.2% (1398 of 2780 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ja/
---
 src/i18n/strings/ja.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index bab9d94935..b5e28a9c1e 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -416,8 +416,8 @@
     "Share Link to User": "ユーザーへのリンクを共有する",
     "Unmute": "ミュート解除",
     "Admin Tools": "管理者ツール",
-    "and %(count)s others...|other": "そして、他 %(count)s ...",
-    "and %(count)s others...|one": "そして、もう1つ...",
+    "and %(count)s others...|other": "他 %(count)s 人...",
+    "and %(count)s others...|one": "他1人...",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (権限レベル: %(powerLevelNumber)s )",
     "Attachment": "付属品",
     "Hangup": "電話を切る",
@@ -625,7 +625,7 @@
     "Custom level": "カスタムレベル",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "返信されたイベントを読み込めません。存在しないか、表示する権限がありません。",
     "<a>In reply to</a> <pill>": "<a>返信</a> <pill>",
-    "And %(count)s more...|other": "そして %(count)s もっと...",
+    "And %(count)s more...|other": "他 %(count)s 人以上...",
     "ex. @bob:example.com": "例 @bob:example.com",
     "Add User": "ユーザーを追加",
     "Matrix ID": "Matirx ID",

From d3af6b840a5993d3684e190c6d478fb6218d144c Mon Sep 17 00:00:00 2001
From: Rintan <rintanbroadleaf@outlook.jp>
Date: Mon, 1 Mar 2021 04:42:56 +0000
Subject: [PATCH 188/420] Translated using Weblate (Japanese)

Currently translated at 50.2% (1398 of 2780 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ja/
---
 src/i18n/strings/ja.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index b5e28a9c1e..ea7d51ae05 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -1533,5 +1533,7 @@
     "<requestLink>Re-request encryption keys</requestLink> from your other sessions.": "あなたの他のセッションに<requestLink>暗号鍵を再リクエストする</requestLink>。",
     "Block anyone not part of %(serverName)s from ever joining this room.": "%(serverName)s 以外からの参加をブロック",
     "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone.": "プライベートな部屋は招待者のみが参加できます。公開された部屋は誰でも検索・参加できます。",
-    "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Matrix 関連のセキュリティ問題を報告するには、Matrix.org の <a>Security Disclosure Policy</a> をご覧ください。"
+    "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Matrix 関連のセキュリティ問題を報告するには、Matrix.org の <a>Security Disclosure Policy</a> をご覧ください。",
+    "Confirm adding email": "メールアドレスの追加を確認する",
+    "Confirm adding this email address by using Single Sign On to prove your identity.": "シングルサインオンを使用して本人確認を行い、メールアドレスの追加を承認してください。"
 }

From a82ac0cc90f427988d236f4065e13716adf34b97 Mon Sep 17 00:00:00 2001
From: waclaw66 <waclaw66@seznam.cz>
Date: Wed, 3 Mar 2021 09:51:41 +0000
Subject: [PATCH 189/420] Translated using Weblate (Czech)

Currently translated at 100.0% (2780 of 2780 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-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 47a99ab670..db01caed97 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -490,7 +490,7 @@
     "were invited %(count)s times|other": "byli %(count)s krát pozváni",
     "were invited %(count)s times|one": "byli pozváni",
     "was invited %(count)s times|other": "byl %(count)s krát pozván",
-    "was invited %(count)s times|one": "byl pozván",
+    "was invited %(count)s times|one": "byl(a) pozván(a)",
     "were banned %(count)s times|other": "mělid %(count)s krát zakázaný vstup",
     "were banned %(count)s times|one": "měli zakázaný vstup",
     "was banned %(count)s times|other": "měl %(count)s krát zakázaný vstup",

From b71695d803d2c80998e7597e8e17c8c538ff4b3d Mon Sep 17 00:00:00 2001
From: MamasLT <admin@eastwesthost.com>
Date: Wed, 3 Mar 2021 20:57:29 +0000
Subject: [PATCH 190/420] Translated using Weblate (Lithuanian)

Currently translated at 68.5% (1905 of 2780 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/lt/
---
 src/i18n/strings/lt.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/lt.json b/src/i18n/strings/lt.json
index 7edb8f0c55..80b70e67e4 100644
--- a/src/i18n/strings/lt.json
+++ b/src/i18n/strings/lt.json
@@ -429,7 +429,7 @@
     "Unban this user?": "Atblokuoti šį vartotoją?",
     "Ban this user?": "Užblokuoti šį vartotoją?",
     "Failed to ban user": "Nepavyko užblokuoti vartotojo",
-    "Invited": "Pakviestas",
+    "Invited": "Pakviesta",
     "Filter room members": "Filtruoti kambario dalyvius",
     "Server unavailable, overloaded, or something else went wrong.": "Serveris neprieinamas, perkrautas arba nutiko kažkas kito.",
     "%(duration)ss": "%(duration)s sek",

From 0f5f1132a5617c9dce893d4cc99e2750a48b0a97 Mon Sep 17 00:00:00 2001
From: HelaBasa <R45XvezA@protonmail.ch>
Date: Tue, 2 Mar 2021 17:15:57 +0000
Subject: [PATCH 191/420] Translated using Weblate (Sinhala)

Currently translated at 0.2% (7 of 2780 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/si/
---
 src/i18n/strings/si.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/si.json b/src/i18n/strings/si.json
index 11da7b7e4c..5a81da879f 100644
--- a/src/i18n/strings/si.json
+++ b/src/i18n/strings/si.json
@@ -4,5 +4,6 @@
     "Use Single Sign On to continue": "ඉදිරියට යාමට තනි පුරනය වීම භාවිතා කරන්න",
     "Confirm adding this email address by using Single Sign On to prove your identity.": "ඔබගේ අනන්‍යතාවය සනාථ කිරීම සඳහා තනි පුරනය භාවිතා කිරීමෙන් මෙම විද්‍යුත් තැපැල් ලිපිනය එක් කිරීම තහවුරු කරන්න.",
     "Confirm": "තහවුරු කරන්න",
-    "Add Email Address": "විද්‍යුත් තැපැල් ලිපිනය එක් කරන්න"
+    "Add Email Address": "විද්‍යුත් තැපැල් ලිපිනය එක් කරන්න",
+    "Sign In": "පිවිසෙන්න"
 }

From 1427aa4203a5610be22bdb43eaab391cf83d88cb Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 8 Mar 2021 04:41:51 +0000
Subject: [PATCH 192/420] fix mx_EncryptionInfo_spinner padding in dialogs

---
 res/css/views/right_panel/_EncryptionInfo.scss | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/res/css/views/right_panel/_EncryptionInfo.scss b/res/css/views/right_panel/_EncryptionInfo.scss
index e13b1b6802..b3d4275f60 100644
--- a/res/css/views/right_panel/_EncryptionInfo.scss
+++ b/res/css/views/right_panel/_EncryptionInfo.scss
@@ -14,13 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_UserInfo {
-    .mx_EncryptionInfo_spinner {
-        .mx_Spinner {
-            margin-top: 25px;
-            margin-bottom: 15px;
-        }
-
-        text-align: center;
+.mx_EncryptionInfo_spinner {
+    .mx_Spinner {
+        margin-top: 25px;
+        margin-bottom: 15px;
     }
+
+    text-align: center;
 }

From 76738184003e1e2ad8d24ad2fbbab3b5dab2afc2 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 8 Mar 2021 04:43:59 +0000
Subject: [PATCH 193/420] switch to using an explicit verify button when
 cross-signing a new login

---
 .../structures/auth/SetupEncryptionBody.js    | 46 +++++++++++--------
 1 file changed, 28 insertions(+), 18 deletions(-)

diff --git a/src/components/structures/auth/SetupEncryptionBody.js b/src/components/structures/auth/SetupEncryptionBody.js
index 3e7264dfec..d2b3fbd3b9 100644
--- a/src/components/structures/auth/SetupEncryptionBody.js
+++ b/src/components/structures/auth/SetupEncryptionBody.js
@@ -19,6 +19,8 @@ import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
 import SdkConfig from '../../../SdkConfig';
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
+import Modal from '../../../Modal';
+import VerificationRequestDialog from '../../views/dialogs/VerificationRequestDialog';
 import * as sdk from '../../../index';
 import {
     SetupEncryptionStore,
@@ -81,6 +83,22 @@ export default class SetupEncryptionBody extends React.Component {
         store.usePassPhrase();
     }
 
+    _onVerifyClick = () => {
+        const cli = MatrixClientPeg.get();
+        const userId = cli.getUserId();
+        const requestPromise = cli.requestVerification(userId);
+
+        this.props.onFinished(true);
+        Modal.createTrackedDialog('New Session Verification', 'Starting dialog', VerificationRequestDialog, {
+            verificationRequestPromise: requestPromise,
+            member: cli.getUser(userId),
+            onFinished: async () => {
+                const request = await requestPromise;
+                request.cancel();
+            },
+        });
+    }
+
     onSkipClick = () => {
         const store = SetupEncryptionStore.sharedInstance();
         store.skip();
@@ -132,32 +150,24 @@ export default class SetupEncryptionBody extends React.Component {
                 </AccessibleButton>;
             }
 
+            let verifyButton;
+            if (store.hasDevicesToVerifyAgainst) {
+                verifyButton = <AccessibleButton kind="primary" onClick={this._onVerifyClick}>
+                    { _t("Verify against another session") }
+                </AccessibleButton>;
+            }
+
             const brand = SdkConfig.get().brand;
 
             return (
                 <div>
                     <p>{_t(
-                        "Confirm your identity by verifying this login from one of your other sessions, " +
-                        "granting it access to encrypted messages.",
+                        "Verify this login to access your encrypted messages and " +
+                        "prove to others that this login is really you."
                     )}</p>
-                    <p>{_t(
-                        "This requires the latest %(brand)s on your other devices:",
-                        { brand },
-                    )}</p>
-
-                    <div className="mx_CompleteSecurity_clients">
-                        <div className="mx_CompleteSecurity_clients_desktop">
-                            <div>{_t("%(brand)s Web", { brand })}</div>
-                            <div>{_t("%(brand)s Desktop", { brand })}</div>
-                        </div>
-                        <div className="mx_CompleteSecurity_clients_mobile">
-                            <div>{_t("%(brand)s iOS", { brand })}</div>
-                            <div>{_t("%(brand)s Android", { brand })}</div>
-                        </div>
-                        <p>{_t("or another cross-signing capable Matrix client")}</p>
-                    </div>
 
                     <div className="mx_CompleteSecurity_actionRow">
+                        {verifyButton}
                         {useRecoveryKeyButton}
                         <AccessibleButton kind="danger" onClick={this.onSkipClick}>
                             {_t("Skip")}

From 6df8157a40e6da23850ad5fd1a17294d6ba23382 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 8 Mar 2021 04:45:44 +0000
Subject: [PATCH 194/420] cancel VRD at the Modal level, so clicking in the bg
 cancels it

---
 .../views/dialogs/NewSessionReviewDialog.js         |  4 ++++
 .../views/dialogs/VerificationRequestDialog.js      | 13 ++-----------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/components/views/dialogs/NewSessionReviewDialog.js b/src/components/views/dialogs/NewSessionReviewDialog.js
index e17501da40..5172f29405 100644
--- a/src/components/views/dialogs/NewSessionReviewDialog.js
+++ b/src/components/views/dialogs/NewSessionReviewDialog.js
@@ -66,6 +66,10 @@ export default class NewSessionReviewDialog extends React.PureComponent {
         Modal.createTrackedDialog('New Session Verification', 'Starting dialog', VerificationRequestDialog, {
             verificationRequestPromise: requestPromise,
             member: cli.getUser(userId),
+            onFinished: async () => {
+                const request = await requestPromise;
+                request.cancel();
+            },
         });
     }
 
diff --git a/src/components/views/dialogs/VerificationRequestDialog.js b/src/components/views/dialogs/VerificationRequestDialog.js
index 3a6e9a2d10..2a5b7ae699 100644
--- a/src/components/views/dialogs/VerificationRequestDialog.js
+++ b/src/components/views/dialogs/VerificationRequestDialog.js
@@ -25,11 +25,11 @@ export default class VerificationRequestDialog extends React.Component {
         verificationRequest: PropTypes.object,
         verificationRequestPromise: PropTypes.object,
         onFinished: PropTypes.func.isRequired,
+        member: PropTypes.string,
     };
 
     constructor(...args) {
         super(...args);
-        this.onFinished = this.onFinished.bind(this);
         this.state = {};
         if (this.props.verificationRequest) {
             this.state.verificationRequest = this.props.verificationRequest;
@@ -50,7 +50,7 @@ export default class VerificationRequestDialog extends React.Component {
         const title = request && request.isSelfVerification ?
             _t("Verify other session") : _t("Verification Request");
 
-        return <BaseDialog className="mx_InfoDialog" onFinished={this.onFinished}
+        return <BaseDialog className="mx_InfoDialog" onFinished={this.props.onFinished}
                 contentId="mx_Dialog_content"
                 title={title}
                 hasCancel={true}
@@ -64,13 +64,4 @@ export default class VerificationRequestDialog extends React.Component {
             />
         </BaseDialog>;
     }
-
-    async onFinished() {
-        this.props.onFinished();
-        let request = this.props.verificationRequest;
-        if (!request && this.props.verificationRequestPromise) {
-            request = await this.props.verificationRequestPromise;
-        }
-        request.cancel();
-    }
 }

From 5b48e13eb91760bd71b088d93da29e9e291301a9 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 8 Mar 2021 04:46:15 +0000
Subject: [PATCH 195/420] add explicit link to edit devices from one's own
 UserInfo

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

diff --git a/src/components/views/right_panel/UserInfo.tsx b/src/components/views/right_panel/UserInfo.tsx
index a4b5cd0fbb..ea8c467d13 100644
--- a/src/components/views/right_panel/UserInfo.tsx
+++ b/src/components/views/right_panel/UserInfo.tsx
@@ -46,6 +46,7 @@ import EncryptionPanel from "./EncryptionPanel";
 import {useAsyncMemo} from '../../../hooks/useAsyncMemo';
 import {legacyVerifyUser, verifyDevice, verifyUser} from '../../../verification';
 import {Action} from "../../../dispatcher/actions";
+import { USER_SECURITY_TAB } from "../dialogs/UserSettingsDialog";
 import {useIsEncrypted} from "../../../hooks/useIsEncrypted";
 import BaseCard from "./BaseCard";
 import {E2EStatus} from "../../../utils/ShieldUtils";
@@ -1362,6 +1363,20 @@ const BasicUserInfo: React.FC<{
         }
     }
 
+    let editDevices;
+    if (member.userId == cli.getUserId()) {
+        editDevices = (<p>
+            <AccessibleButton className="mx_UserInfo_field" onClick={() => {
+                dis.dispatch({
+                    action: Action.ViewUserSettings,
+                    initialTabId: USER_SECURITY_TAB,
+                });
+            }}>
+                { _t("Edit devices") }
+            </AccessibleButton>
+        </p>)
+    }
+
     const securitySection = (
         <div className="mx_UserInfo_container">
             <h3>{ _t("Security") }</h3>
@@ -1371,6 +1386,7 @@ const BasicUserInfo: React.FC<{
                 loading={showDeviceListSpinner}
                 devices={devices}
                 userId={member.userId} /> }
+            { editDevices }
         </div>
     );
 

From aa0cca9306f2e56f134a82937c87e397346cd8b9 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 8 Mar 2021 04:46:47 +0000
Subject: [PATCH 196/420] report IP of self-verification reqs

---
 .../views/toasts/VerificationRequestToast.tsx     | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/components/views/toasts/VerificationRequestToast.tsx b/src/components/views/toasts/VerificationRequestToast.tsx
index 8c8a74b2be..73440eb822 100644
--- a/src/components/views/toasts/VerificationRequestToast.tsx
+++ b/src/components/views/toasts/VerificationRequestToast.tsx
@@ -38,6 +38,7 @@ interface IProps {
 interface IState {
     counter: number;
     device?: DeviceInfo;
+    IP?: string;
 }
 
 export default class VerificationRequestToast extends React.PureComponent<IProps, IState> {
@@ -66,9 +67,15 @@ export default class VerificationRequestToast extends React.PureComponent<IProps
         // a toast hanging around after logging in if you did a verification as part of login).
         this._checkRequestIsPending();
 
+
         if (request.isSelfVerification) {
             const cli = MatrixClientPeg.get();
-            this.setState({device: cli.getStoredDevice(cli.getUserId(), request.channel.deviceId)});
+            const device = await cli.getDevice(request.channel.deviceId);
+            const IP = device.last_seen_ip;
+            this.setState({
+                device: cli.getStoredDevice(cli.getUserId(), request.channel.deviceId),
+                IP,
+            });
         }
     }
 
@@ -118,6 +125,9 @@ export default class VerificationRequestToast extends React.PureComponent<IProps
                 const VerificationRequestDialog = sdk.getComponent("views.dialogs.VerificationRequestDialog");
                 Modal.createTrackedDialog('Incoming Verification', '', VerificationRequestDialog, {
                     verificationRequest: request,
+                    onFinished: () => {
+                        request.cancel();
+                    },
                 }, null, /* priority = */ false, /* static = */ true);
             }
             await request.accept();
@@ -131,9 +141,10 @@ export default class VerificationRequestToast extends React.PureComponent<IProps
         let nameLabel;
         if (request.isSelfVerification) {
             if (this.state.device) {
-                nameLabel = _t("From %(deviceName)s (%(deviceId)s)", {
+                nameLabel = _t("From %(deviceName)s (%(deviceId)s) from %(IP)s", {
                     deviceName: this.state.device.getDisplayName(),
                     deviceId: this.state.device.deviceId,
+                    IP: this.state.IP,
                 });
             }
         } else {

From d477f964d200993641f29b28752fc3d81a9c9e06 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 8 Mar 2021 04:49:59 +0000
Subject: [PATCH 197/420] only prompt to verify if we have an MSK or we have
 devices to verify against

---
 src/stores/SetupEncryptionStore.js | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/stores/SetupEncryptionStore.js b/src/stores/SetupEncryptionStore.js
index 981ce6eca9..525678f9a3 100644
--- a/src/stores/SetupEncryptionStore.js
+++ b/src/stores/SetupEncryptionStore.js
@@ -49,6 +49,7 @@ export class SetupEncryptionStore extends EventEmitter {
         cli.on("crypto.verification.request", this.onVerificationRequest);
         cli.on('userTrustStatusChanged', this._onUserTrustStatusChanged);
 
+
         const requestsInProgress = cli.getVerificationRequestsToDeviceInProgress(cli.getUserId());
         if (requestsInProgress.length) {
             // If there are multiple, we take the most recent. Equally if the user sends another request from
@@ -75,7 +76,8 @@ export class SetupEncryptionStore extends EventEmitter {
     }
 
     async fetchKeyInfo() {
-        const keys = await MatrixClientPeg.get().isSecretStored('m.cross_signing.master', false);
+        const cli = MatrixClientPeg.get();
+        const keys = await cli.isSecretStored('m.cross_signing.master', false);
         if (keys === null || Object.keys(keys).length === 0) {
             this.keyId = null;
             this.keyInfo = null;
@@ -85,7 +87,22 @@ export class SetupEncryptionStore extends EventEmitter {
             this.keyInfo = keys[this.keyId];
         }
 
-        this.phase = PHASE_INTRO;
+        // do we have any other devices which are E2EE which we can verify against?
+        const dehydratedDevice = await cli.getDehydratedDevice();
+        this.hasDevicesToVerifyAgainst = cli.getStoredDevicesForUser(cli.getUserId()).some(
+            device =>
+                device.getIdentityKey() &&
+                (!dehydratedDevice || (device.deviceId != dehydratedDevice.device_id))
+        );
+
+        if (!this.hasDevicesToVerifyAgainst && !this.keyInfo) {
+            // skip before we can even render anything.
+            // XXX: this causes a dialog box flash
+            this.phase = PHASE_FINISHED;
+        }
+        else {
+            this.phase = PHASE_INTRO;
+        }
         this.emit("update");
     }
 

From c73097a5b0d48e648ffaae8b74b5949b4773335b Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 8 Mar 2021 04:51:16 +0000
Subject: [PATCH 198/420] fix unhelpful 'Review...' toast wording

---
 src/toasts/BulkUnverifiedSessionsToast.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/toasts/BulkUnverifiedSessionsToast.ts b/src/toasts/BulkUnverifiedSessionsToast.ts
index 41717e0804..bc129ebd54 100644
--- a/src/toasts/BulkUnverifiedSessionsToast.ts
+++ b/src/toasts/BulkUnverifiedSessionsToast.ts
@@ -39,7 +39,7 @@ export const showToast = (deviceIds: Set<string>) => {
 
     ToastStore.sharedInstance().addOrReplaceToast({
         key: TOAST_KEY,
-        title: _t("Review where you’re logged in"),
+        title: _t("You have unverified logins"),
         icon: "verification_warning",
         props: {
             description: _t("Verify all your sessions to ensure your account & messages are safe"),

From 96ebbad959bf3a169a2d8911fba585bb61360919 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 8 Mar 2021 04:54:44 +0000
Subject: [PATCH 199/420] switch UnverifiedSessionToast to route to check
 sessions rather than verify the new login

given the chances are that the new login will be stuck doing initial sync, and won't be in position
to be verified until its finished.
---
 src/i18n/strings/en_EN.json          | 17 +++++++--------
 src/toasts/UnverifiedSessionToast.ts | 31 +++++++++++++++-------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index e8a4b86c77..0b6f68a738 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -725,7 +725,7 @@
     "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.",
     "Yes": "Yes",
     "No": "No",
-    "Review where you’re logged in": "Review where you’re logged in",
+    "You have unverified logins": "You have unverified logins",
     "Verify all your sessions to ensure your account & messages are safe": "Verify all your sessions to ensure your account & messages are safe",
     "Review": "Review",
     "Later": "Later",
@@ -749,7 +749,8 @@
     "Safeguard against losing access to encrypted messages & data": "Safeguard against losing access to encrypted messages & data",
     "Other users may not trust it": "Other users may not trust it",
     "New login. Was this you?": "New login. Was this you?",
-    "Verify the new login accessing your account: %(name)s": "Verify the new login accessing your account: %(name)s",
+    "A new login is accessing your account: %(name)s (%(deviceID)s) from %(IP)s": "A new login is accessing your account: %(name)s (%(deviceID)s) from %(IP)s",
+    "Check your devices": "Check your devices",
     "What's new?": "What's new?",
     "What's New": "What's New",
     "Update": "Update",
@@ -974,7 +975,7 @@
     "Folder": "Folder",
     "Pin": "Pin",
     "Your server isn't responding to some <a>requests</a>.": "Your server isn't responding to some <a>requests</a>.",
-    "From %(deviceName)s (%(deviceId)s)": "From %(deviceName)s (%(deviceId)s)",
+    "From %(deviceName)s (%(deviceId)s) from %(IP)s": "From %(deviceName)s (%(deviceId)s) from %(IP)s",
     "Decline (%(counter)s)": "Decline (%(counter)s)",
     "Accept <policyLink /> to continue:": "Accept <policyLink /> to continue:",
     "Remove": "Remove",
@@ -1711,6 +1712,7 @@
     "Failed to deactivate user": "Failed to deactivate user",
     "Role": "Role",
     "This client does not support end-to-end encryption.": "This client does not support end-to-end encryption.",
+    "Edit devices": "Edit devices",
     "Security": "Security",
     "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what %(brand)s supports. Try with a different client.": "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what %(brand)s supports. Try with a different client.",
     "Verify by scanning": "Verify by scanning",
@@ -2611,13 +2613,8 @@
     "Decide where your account is hosted": "Decide where your account is hosted",
     "Use Security Key or Phrase": "Use Security Key or Phrase",
     "Use Security Key": "Use Security Key",
-    "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 %(brand)s on your other devices:": "This requires the latest %(brand)s on your other devices:",
-    "%(brand)s Web": "%(brand)s Web",
-    "%(brand)s Desktop": "%(brand)s Desktop",
-    "%(brand)s iOS": "%(brand)s iOS",
-    "%(brand)s Android": "%(brand)s Android",
-    "or another cross-signing capable Matrix client": "or another cross-signing capable Matrix client",
+    "Verify against another session": "Verify against another session",
+    "Verify this login to access your encrypted messages and prove to others that this login is really you.": "Verify this login to access your encrypted messages and prove to others that this login is really you.",
     "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.",
diff --git a/src/toasts/UnverifiedSessionToast.ts b/src/toasts/UnverifiedSessionToast.ts
index 9dedd2b137..32635e689a 100644
--- a/src/toasts/UnverifiedSessionToast.ts
+++ b/src/toasts/UnverifiedSessionToast.ts
@@ -15,38 +15,36 @@ limitations under the License.
 */
 
 import { _t } from '../languageHandler';
+import dis from "../dispatcher/dispatcher";
 import { MatrixClientPeg } from '../MatrixClientPeg';
 import Modal from '../Modal';
 import DeviceListener from '../DeviceListener';
 import NewSessionReviewDialog from '../components/views/dialogs/NewSessionReviewDialog';
 import ToastStore from "../stores/ToastStore";
 import GenericToast from "../components/views/toasts/GenericToast";
+import { Action } from "../dispatcher/actions";
+import { USER_SECURITY_TAB } from "../components/views/dialogs/UserSettingsDialog";
 
 function toastKey(deviceId: string) {
     return "unverified_session_" + deviceId;
 }
 
-export const showToast = (deviceId: string) => {
+export const showToast = async (deviceId: string) => {
     const cli = MatrixClientPeg.get();
 
     const onAccept = () => {
-        Modal.createTrackedDialog('New Session Review', 'Starting dialog', NewSessionReviewDialog, {
-            userId: cli.getUserId(),
-            device: cli.getStoredDevice(cli.getUserId(), deviceId),
-            onFinished: (r) => {
-                if (!r) {
-                    /* This'll come back false if the user clicks "this wasn't me" and saw a warning dialog */
-                    DeviceListener.sharedInstance().dismissUnverifiedSessions([deviceId]);
-                }
-            },
-        }, null, /* priority = */ false, /* static = */ true);
+        DeviceListener.sharedInstance().dismissUnverifiedSessions([deviceId]);
+        dis.dispatch({
+            action: Action.ViewUserSettings,
+            initialTabId: USER_SECURITY_TAB,
+        });
     };
 
     const onReject = () => {
         DeviceListener.sharedInstance().dismissUnverifiedSessions([deviceId]);
     };
 
-    const device = cli.getStoredDevice(cli.getUserId(), deviceId);
+    const device = await cli.getDevice(deviceId);
 
     ToastStore.sharedInstance().addOrReplaceToast({
         key: toastKey(deviceId),
@@ -54,8 +52,13 @@ export const showToast = (deviceId: string) => {
         icon: "verification_warning",
         props: {
             description: _t(
-                "Verify the new login accessing your account: %(name)s", { name: device.getDisplayName()}),
-            acceptLabel: _t("Verify"),
+                "A new login is accessing your account: %(name)s (%(deviceID)s) from %(IP)s", {
+                        name: device.display_name,
+                        deviceID: deviceId,
+                        IP: device.last_seen_ip,
+                    }
+            ),
+            acceptLabel: _t("Check your devices"),
             onAccept,
             rejectLabel: _t("Later"),
             onReject,

From 997d6e12811015f3c60d3813f1018fd9d5ac10e8 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 8 Mar 2021 05:08:01 +0000
Subject: [PATCH 200/420] lint

---
 src/components/structures/auth/SetupEncryptionBody.js |  4 +---
 src/stores/SetupEncryptionStore.js                    |  5 ++---
 src/toasts/UnverifiedSessionToast.ts                  | 10 ++++------
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/components/structures/auth/SetupEncryptionBody.js b/src/components/structures/auth/SetupEncryptionBody.js
index d2b3fbd3b9..d40192f9c1 100644
--- a/src/components/structures/auth/SetupEncryptionBody.js
+++ b/src/components/structures/auth/SetupEncryptionBody.js
@@ -157,13 +157,11 @@ export default class SetupEncryptionBody extends React.Component {
                 </AccessibleButton>;
             }
 
-            const brand = SdkConfig.get().brand;
-
             return (
                 <div>
                     <p>{_t(
                         "Verify this login to access your encrypted messages and " +
-                        "prove to others that this login is really you."
+                        "prove to others that this login is really you.",
                     )}</p>
 
                     <div className="mx_CompleteSecurity_actionRow">
diff --git a/src/stores/SetupEncryptionStore.js b/src/stores/SetupEncryptionStore.js
index 525678f9a3..fdabfa8019 100644
--- a/src/stores/SetupEncryptionStore.js
+++ b/src/stores/SetupEncryptionStore.js
@@ -92,15 +92,14 @@ export class SetupEncryptionStore extends EventEmitter {
         this.hasDevicesToVerifyAgainst = cli.getStoredDevicesForUser(cli.getUserId()).some(
             device =>
                 device.getIdentityKey() &&
-                (!dehydratedDevice || (device.deviceId != dehydratedDevice.device_id))
+                (!dehydratedDevice || (device.deviceId != dehydratedDevice.device_id)),
         );
 
         if (!this.hasDevicesToVerifyAgainst && !this.keyInfo) {
             // skip before we can even render anything.
             // XXX: this causes a dialog box flash
             this.phase = PHASE_FINISHED;
-        }
-        else {
+        } else {
             this.phase = PHASE_INTRO;
         }
         this.emit("update");
diff --git a/src/toasts/UnverifiedSessionToast.ts b/src/toasts/UnverifiedSessionToast.ts
index 32635e689a..d375ef6112 100644
--- a/src/toasts/UnverifiedSessionToast.ts
+++ b/src/toasts/UnverifiedSessionToast.ts
@@ -17,9 +17,7 @@ limitations under the License.
 import { _t } from '../languageHandler';
 import dis from "../dispatcher/dispatcher";
 import { MatrixClientPeg } from '../MatrixClientPeg';
-import Modal from '../Modal';
 import DeviceListener from '../DeviceListener';
-import NewSessionReviewDialog from '../components/views/dialogs/NewSessionReviewDialog';
 import ToastStore from "../stores/ToastStore";
 import GenericToast from "../components/views/toasts/GenericToast";
 import { Action } from "../dispatcher/actions";
@@ -53,10 +51,10 @@ export const showToast = async (deviceId: string) => {
         props: {
             description: _t(
                 "A new login is accessing your account: %(name)s (%(deviceID)s) from %(IP)s", {
-                        name: device.display_name,
-                        deviceID: deviceId,
-                        IP: device.last_seen_ip,
-                    }
+                    name: device.display_name,
+                    deviceID: deviceId,
+                    IP: device.last_seen_ip,
+                },
             ),
             acceptLabel: _t("Check your devices"),
             onAccept,

From 7abc48a71679de4afa37fe73d8edf966f29af43e Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 8 Mar 2021 05:30:02 +0000
Subject: [PATCH 201/420] lint

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

diff --git a/src/components/structures/auth/SetupEncryptionBody.js b/src/components/structures/auth/SetupEncryptionBody.js
index d40192f9c1..4e3d106eb1 100644
--- a/src/components/structures/auth/SetupEncryptionBody.js
+++ b/src/components/structures/auth/SetupEncryptionBody.js
@@ -17,7 +17,6 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
-import SdkConfig from '../../../SdkConfig';
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import Modal from '../../../Modal';
 import VerificationRequestDialog from '../../views/dialogs/VerificationRequestDialog';

From f5458665721d1c241ff004a96c8b572e3ad87ae1 Mon Sep 17 00:00:00 2001
From: Helder Ferreira <me@helderferreira.io>
Date: Mon, 8 Mar 2021 08:08:02 +0000
Subject: [PATCH 202/420] add clipboard write permission

---
 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 213351889f..d290dbeaff 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -325,7 +325,7 @@ export default class AppTile extends React.Component {
 
         // Additional iframe feature pemissions
         // (see - https://sites.google.com/a/chromium.org/dev/Home/chromium-security/deprecating-permissions-in-cross-origin-iframes and https://wicg.github.io/feature-policy/)
-        const iframeFeatures = "microphone; camera; encrypted-media; autoplay; display-capture;";
+        const iframeFeatures = "microphone; camera; encrypted-media; autoplay; display-capture; clipboard-write;";
 
         const appTileBodyClass = 'mx_AppTileBody' + (this.props.miniMode ? '_mini  ' : ' ');
 

From 6106e01ab496f16ac4c36911f67f8df817cf2025 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 8 Mar 2021 09:39:07 +0000
Subject: [PATCH 203/420] Collapse redactions into an event list summary

---
 src/components/structures/MessagePanel.js | 93 ++++++++++++++++++++++-
 src/i18n/strings/en_EN.json               |  2 +
 2 files changed, 94 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 161227a139..28214aada9 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -1001,6 +1001,97 @@ class CreationGrouper {
     }
 }
 
+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;
+        }
+        return ev.isRedacted();
+    }
+
+    add(ev) {
+        this.readMarker = this.readMarker || this.panel._readMarkerForEvent(
+            ev.getId(),
+            ev === this.lastShownEvent,
+        );
+        this.events.push(ev);
+    }
+
+    getTiles() {
+        if (!this.events || !this.events.length) return [];
+
+        const DateSeparator = sdk.getComponent('messages.DateSeparator');
+        const EventListSummary = sdk.getComponent('views.elements.EventListSummary');
+
+        const panel = this.panel;
+        const ret = [];
+        const lastShownEvent = this.lastShownEvent;
+
+        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>,
+            );
+        }
+
+        const key = "redactioneventlistsummary-" + (
+            this.prevEvent ? this.events[0].getId() : "initial"
+        );
+
+        const senders = new Set();
+        let eventTiles = this.events.map((e) => {
+            senders.add(e.sender);
+            // In order to prevent DateSeparators from appearing in the expanded form,
+            // 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(
+            <EventListSummary
+                key={key}
+                threshold={2}
+                events={this.events}
+                onToggle={panel._onHeightChanged} // Update scroll state
+                summaryMembers={Array.from(senders)}
+                summaryText={_t("%(count)s messages deleted.", { count: eventTiles.length })}
+            >
+                { eventTiles }
+            </EventListSummary>,
+        );
+
+        if (this.readMarker) {
+            ret.push(this.readMarker);
+        }
+
+        return ret;
+    }
+
+    getNewPrevEvent() {
+        return this.events[0];
+    }
+}
+
 // Wrap consecutive member events in a ListSummary, ignore if redacted
 class MemberGrouper {
     static canStartGroup = function(panel, ev) {
@@ -1111,4 +1202,4 @@ class MemberGrouper {
 }
 
 // all the grouper classes that we use
-const groupers = [CreationGrouper, MemberGrouper];
+const groupers = [CreationGrouper, MemberGrouper, RedactionGrouper];
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index daa38b9b3e..e78792ec51 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2541,6 +2541,8 @@
     "Logout": "Logout",
     "%(creator)s created this DM.": "%(creator)s created this DM.",
     "%(creator)s created and configured the room.": "%(creator)s created and configured the room.",
+    "%(count)s messages deleted.|other": "%(count)s messages deleted.",
+    "%(count)s messages deleted.|one": "%(count)s message deleted.",
     "Your Communities": "Your Communities",
     "Did you know: you can use communities to filter your %(brand)s experience!": "Did you know: you can use communities to filter your %(brand)s experience!",
     "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.",

From df4631d65ba5e7b213e798f226102cf4de5ce05b Mon Sep 17 00:00:00 2001
From: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
Date: Mon, 8 Mar 2021 15:00:09 +0000
Subject: [PATCH 204/420] Fix some ineffective placeholders in a couple log
 lines (#5729)

Was producing `Presence: %s unavailable` in the logs.
---
 src/Presence.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Presence.ts b/src/Presence.ts
index 660bb0ac94..eb56c5714e 100644
--- a/src/Presence.ts
+++ b/src/Presence.ts
@@ -99,9 +99,9 @@ class Presence {
 
         try {
             await MatrixClientPeg.get().setPresence(this.state);
-            console.info("Presence: %s", newState);
+            console.info("Presence:", newState);
         } catch (err) {
-            console.error("Failed to set presence: %s", err);
+            console.error("Failed to set presence:", err);
             this.state = oldState;
         }
     }

From fdea45ad74905346744e5a4c5c77bd3ddf64d3f1 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 8 Mar 2021 08:51:57 -0700
Subject: [PATCH 205/420] Add a quick sender check to isLastSuccessful

---
 src/components/structures/MessagePanel.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index c1ccf61470..9deda54bee 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -604,6 +604,10 @@ export default class MessagePanel extends React.Component {
             isLastSuccessful = true;
         }
 
+        // We only want to consider "last successful" if the event is sent by us, otherwise of course
+        // it's successful: we received it.
+        isLastSuccessful = isLastSuccessful && mxEv.getSender() === MatrixClientPeg.get().getUserId();
+
         // use txnId as key if available so that we don't remount during sending
         ret.push(
             <li

From 6a5efad1424c7b4accbfb4f83ec0f37b728c5f0c Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 8 Mar 2021 15:52:21 +0000
Subject: [PATCH 206/420] Show suggested rooms from the selected space

---
 src/components/views/rooms/RoomList.tsx      | 74 +++++++++++++++++++-
 src/components/views/rooms/TemporaryTile.tsx | 19 ++---
 src/i18n/strings/en_EN.json                  |  2 +
 src/stores/SpaceStore.tsx                    | 33 ++++++++-
 src/stores/room-list/models.ts               |  2 +
 5 files changed, 116 insertions(+), 14 deletions(-)

diff --git a/src/components/views/rooms/RoomList.tsx b/src/components/views/rooms/RoomList.tsx
index f7da6571da..beb85e50ce 100644
--- a/src/components/views/rooms/RoomList.tsx
+++ b/src/components/views/rooms/RoomList.tsx
@@ -19,6 +19,7 @@ limitations under the License.
 import * as React from "react";
 import { Dispatcher } from "flux";
 import { Room } from "matrix-js-sdk/src/models/room";
+import * as fbEmitter from "fbemitter";
 
 import { _t, _td } from "../../../languageHandler";
 import { RovingTabIndexProvider } from "../../../accessibility/RovingTabIndex";
@@ -47,9 +48,11 @@ import { IconizedContextMenuOption, IconizedContextMenuOptionList } from "../con
 import AccessibleButton from "../elements/AccessibleButton";
 import { CommunityPrototypeStore } from "../../../stores/CommunityPrototypeStore";
 import CallHandler from "../../../CallHandler";
-import SpaceStore from "../../../stores/SpaceStore";
+import SpaceStore, { SUGGESTED_ROOMS } from "../../../stores/SpaceStore";
 import { showAddExistingRooms, showCreateNewRoom } from "../../../utils/space";
 import { EventType } from "matrix-js-sdk/src/@types/event";
+import { ISpaceSummaryRoom } from "../../structures/SpaceRoomDirectory";
+import RoomAvatar from "../avatars/RoomAvatar";
 
 interface IProps {
     onKeyDown: (ev: React.KeyboardEvent) => void;
@@ -63,6 +66,8 @@ interface IProps {
 interface IState {
     sublists: ITagMap;
     isNameFiltering: boolean;
+    currentRoomId?: string;
+    suggestedRooms: ISpaceSummaryRoom[];
 }
 
 const TAG_ORDER: TagID[] = [
@@ -75,6 +80,7 @@ const TAG_ORDER: TagID[] = [
 
     DefaultTagID.LowPriority,
     DefaultTagID.ServerNotice,
+    DefaultTagID.Suggested,
     DefaultTagID.Archived,
 ];
 const CUSTOM_TAGS_BEFORE_TAG = DefaultTagID.LowPriority;
@@ -242,6 +248,12 @@ const TAG_AESTHETICS: ITagAestheticsMap = {
         isInvite: false,
         defaultHidden: true,
     },
+
+    [DefaultTagID.Suggested]: {
+        sectionLabel: _td("Suggested Rooms"),
+        isInvite: false,
+        defaultHidden: false,
+    },
 };
 
 function customTagAesthetics(tagId: TagID): ITagAesthetics {
@@ -260,6 +272,7 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
     private dispatcherRef;
     private customTagStoreRef;
     private tagAesthetics: ITagAestheticsMap;
+    private roomStoreToken: fbEmitter.EventSubscription;
 
     constructor(props: IProps) {
         super(props);
@@ -267,6 +280,7 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
         this.state = {
             sublists: {},
             isNameFiltering: !!RoomListStore.instance.getFirstNameFilterCondition(),
+            suggestedRooms: SpaceStore.instance.suggestedRooms,
         };
 
         // shallow-copy from the template as we need to make modifications to it
@@ -274,20 +288,30 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
         this.updateDmAddRoomAction();
 
         this.dispatcherRef = defaultDispatcher.register(this.onAction);
+        this.roomStoreToken = RoomViewStore.addListener(this.onRoomViewStoreUpdate);
     }
 
     public componentDidMount(): void {
+        SpaceStore.instance.on(SUGGESTED_ROOMS, this.updateSuggestedRooms);
         RoomListStore.instance.on(LISTS_UPDATE_EVENT, this.updateLists);
         this.customTagStoreRef = CustomRoomTagStore.addListener(this.updateLists);
         this.updateLists(); // trigger the first update
     }
 
     public componentWillUnmount() {
+        SpaceStore.instance.off(SUGGESTED_ROOMS, this.updateSuggestedRooms);
         RoomListStore.instance.off(LISTS_UPDATE_EVENT, this.updateLists);
         defaultDispatcher.unregister(this.dispatcherRef);
         if (this.customTagStoreRef) this.customTagStoreRef.remove();
+        if (this.roomStoreToken) this.roomStoreToken.remove();
     }
 
+    private onRoomViewStoreUpdate = () => {
+        this.setState({
+            currentRoomId: RoomViewStore.getRoomId(),
+        });
+    };
+
     private updateDmAddRoomAction() {
         const dmTagAesthetics = objectShallowClone(TAG_AESTHETICS[DefaultTagID.DM]);
         if (CallHandler.sharedInstance().getSupportsPstnProtocol()) {
@@ -319,7 +343,7 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
 
     private getRoomDelta = (roomId: string, delta: number, unread = false) => {
         const lists = RoomListStore.instance.orderedLists;
-        const rooms: Room = [];
+        const rooms: Room[] = [];
         TAG_ORDER.forEach(t => {
             let listRooms = lists[t];
 
@@ -340,6 +364,10 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
         return room;
     };
 
+    private updateSuggestedRooms = (suggestedRooms: ISpaceSummaryRoom[]) => {
+        this.setState({ suggestedRooms });
+    };
+
     private updateLists = () => {
         const newLists = RoomListStore.instance.orderedLists;
         if (SettingsStore.getValue("advancedRoomListLogging")) {
@@ -394,6 +422,39 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
         dis.dispatch({ action: Action.ViewRoomDirectory, initialText });
     };
 
+    private renderSuggestedRooms(): JSX.Element[] {
+        return this.state.suggestedRooms.map(room => {
+            const name = room.name || room.canonical_alias || room.aliases.pop() || _t("Empty room");
+            const avatar = (
+                <RoomAvatar
+                    oobData={{
+                        name,
+                        avatarUrl: room.avatar_url,
+                    }}
+                    width={32}
+                    height={32}
+                    resizeMethod="crop"
+                />
+            );
+            const viewRoom = () => {
+                defaultDispatcher.dispatch({
+                    action: "view_room",
+                    room_id: room.room_id,
+                });
+            };
+            return (
+                <TemporaryTile
+                    isMinimized={this.props.isMinimized}
+                    isSelected={this.state.currentRoomId === room.room_id}
+                    displayName={name}
+                    avatar={avatar}
+                    onClick={viewRoom}
+                    key={`suggestedRoomTile_${room.room_id}`}
+                />
+            );
+        });
+    }
+
     private renderCommunityInvites(): TemporaryTile[] {
         // TODO: Put community invites in a more sensible place (not in the room list)
         // See https://github.com/vector-im/element-web/issues/14456
@@ -447,7 +508,14 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
 
         for (const orderedTagId of tagOrder) {
             const orderedRooms = this.state.sublists[orderedTagId] || [];
-            const extraTiles = orderedTagId === DefaultTagID.Invite ? this.renderCommunityInvites() : null;
+
+            let extraTiles = null;
+            if (orderedTagId === DefaultTagID.Invite) {
+                extraTiles = this.renderCommunityInvites();
+            } else if (orderedTagId === DefaultTagID.Suggested) {
+                extraTiles = this.renderSuggestedRooms();
+            }
+
             const totalTiles = orderedRooms.length + (extraTiles ? extraTiles.length : 0);
             if (totalTiles === 0 && !ALWAYS_VISIBLE_TAGS.includes(orderedTagId)) {
                 continue; // skip tag - not needed
diff --git a/src/components/views/rooms/TemporaryTile.tsx b/src/components/views/rooms/TemporaryTile.tsx
index eec3105880..31d2acbc61 100644
--- a/src/components/views/rooms/TemporaryTile.tsx
+++ b/src/components/views/rooms/TemporaryTile.tsx
@@ -28,7 +28,7 @@ interface IProps {
     isSelected: boolean;
     displayName: string;
     avatar: React.ReactElement;
-    notificationState: NotificationState;
+    notificationState?: NotificationState;
     onClick: () => void;
 }
 
@@ -63,12 +63,15 @@ export default class TemporaryTile extends React.Component<IProps, IState> {
             'mx_RoomTile_minimized': this.props.isMinimized,
         });
 
-        const badge = (
-            <NotificationBadge
-                notification={this.props.notificationState}
-                forceCount={false}
-            />
-        );
+        let badge;
+        if (this.props.notificationState) {
+            badge = (
+                <NotificationBadge
+                    notification={this.props.notificationState}
+                    forceCount={false}
+                />
+            );
+        }
 
         let name = this.props.displayName;
         if (typeof name !== 'string') name = '';
@@ -76,7 +79,7 @@ export default class TemporaryTile extends React.Component<IProps, IState> {
 
         const nameClasses = classNames({
             "mx_RoomTile_name": true,
-            "mx_RoomTile_nameHasUnreadEvents": this.props.notificationState.isUnread,
+            "mx_RoomTile_nameHasUnreadEvents": this.props.notificationState?.isUnread,
         });
 
         let nameContainer = (
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 7b680b6590..71aae7fecd 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1529,7 +1529,9 @@
     "Low priority": "Low priority",
     "System Alerts": "System Alerts",
     "Historical": "Historical",
+    "Suggested Rooms": "Suggested Rooms",
     "Custom Tag": "Custom Tag",
+    "Empty room": "Empty room",
     "Can't see what you’re looking for?": "Can't see what you’re looking for?",
     "Start a new chat": "Start a new chat",
     "Explore all public rooms": "Explore all public rooms",
diff --git a/src/stores/SpaceStore.tsx b/src/stores/SpaceStore.tsx
index c334144d70..1ada5d6361 100644
--- a/src/stores/SpaceStore.tsx
+++ b/src/stores/SpaceStore.tsx
@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {throttle, sortBy} from "lodash";
-import {EventType} from "matrix-js-sdk/src/@types/event";
+import {sortBy, throttle} from "lodash";
+import {EventType, RoomType} from "matrix-js-sdk/src/@types/event";
 import {Room} from "matrix-js-sdk/src/models/room";
 import {MatrixEvent} from "matrix-js-sdk/src/models/event";
 
@@ -33,6 +33,7 @@ import {EnhancedMap, mapDiff} from "../utils/maps";
 import {setHasDiff} from "../utils/sets";
 import {objectDiff} from "../utils/objects";
 import {arrayHasDiff} from "../utils/arrays";
+import {ISpaceSummaryEvent, ISpaceSummaryRoom} from "../components/structures/SpaceRoomDirectory";
 
 type SpaceKey = string | symbol;
 
@@ -41,11 +42,14 @@ interface IState {}
 const ACTIVE_SPACE_LS_KEY = "mx_active_space";
 
 export const HOME_SPACE = Symbol("home-space");
+export const SUGGESTED_ROOMS = Symbol("suggested-rooms");
 
 export const UPDATE_TOP_LEVEL_SPACES = Symbol("top-level-spaces");
 export const UPDATE_SELECTED_SPACE = Symbol("selected-space");
 // Space Room ID/HOME_SPACE will be emitted when a Space's children change
 
+const MAX_SUGGESTED_ROOMS = 20;
+
 const partitionSpacesAndRooms = (arr: Room[]): [Room[], Room[]] => { // [spaces, rooms]
     return arr.reduce((result, room: Room) => {
         result[room.isSpaceRoom() ? 0 : 1].push(room);
@@ -85,6 +89,7 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
     private spaceFilteredRooms = new Map<string | symbol, Set<string>>();
     // The space currently selected in the Space Panel - if null then `Home` is selected
     private _activeSpace?: Room = null;
+    private _suggestedRooms: ISpaceSummaryRoom[] = [];
 
     public get spacePanelSpaces(): Room[] {
         return this.rootSpaces;
@@ -94,11 +99,16 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
         return this._activeSpace || null;
     }
 
-    public setActiveSpace(space: Room | null) {
+    public get suggestedRooms(): ISpaceSummaryRoom[] {
+        return this._suggestedRooms;
+    }
+
+    public async setActiveSpace(space: Room | null) {
         if (space === this.activeSpace) return;
 
         this._activeSpace = space;
         this.emit(UPDATE_SELECTED_SPACE, this.activeSpace);
+        this.emit(SUGGESTED_ROOMS, this._suggestedRooms = []);
 
         // persist space selected
         if (space) {
@@ -106,6 +116,23 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
         } else {
             window.localStorage.removeItem(ACTIVE_SPACE_LS_KEY);
         }
+
+        if (space) {
+            try {
+                const data: {
+                    rooms: ISpaceSummaryRoom[];
+                    events: ISpaceSummaryEvent[];
+                } = await this.matrixClient.getSpaceSummary(space.roomId, 0, true, false, MAX_SUGGESTED_ROOMS);
+                if (this._activeSpace === space) {
+                    this._suggestedRooms = data.rooms.filter(roomInfo => {
+                        return roomInfo.room_type !== RoomType.Space && !this.matrixClient.getRoom(roomInfo.room_id);
+                    });
+                    this.emit(SUGGESTED_ROOMS, this._suggestedRooms);
+                }
+            } catch (e) {
+                console.error(e);
+            }
+        }
     }
 
     public addRoomToSpace(space: Room, roomId: string, via: string[], suggested = false, autoJoin = false) {
diff --git a/src/stores/room-list/models.ts b/src/stores/room-list/models.ts
index 7d3902f552..54d49ea18a 100644
--- a/src/stores/room-list/models.ts
+++ b/src/stores/room-list/models.ts
@@ -24,6 +24,7 @@ export enum DefaultTagID {
     Favourite = "m.favourite",
     DM = "im.vector.fake.direct",
     ServerNotice = "m.server_notice",
+    Suggested = "im.vector.fake.suggested",
 }
 
 export const OrderedDefaultTagIDs = [
@@ -33,6 +34,7 @@ export const OrderedDefaultTagIDs = [
     DefaultTagID.Untagged,
     DefaultTagID.LowPriority,
     DefaultTagID.ServerNotice,
+    DefaultTagID.Suggested,
     DefaultTagID.Archived,
 ];
 

From 1629b7e62a3179ca756717bd60cf25746871b16d Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 8 Mar 2021 16:44:14 +0000
Subject: [PATCH 207/420] s/IP/ip/; s/from/at/

---
 .../views/toasts/VerificationRequestToast.tsx          | 10 +++++-----
 src/i18n/strings/en_EN.json                            |  4 ++--
 src/toasts/UnverifiedSessionToast.ts                   |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/components/views/toasts/VerificationRequestToast.tsx b/src/components/views/toasts/VerificationRequestToast.tsx
index 73440eb822..82c6b0b952 100644
--- a/src/components/views/toasts/VerificationRequestToast.tsx
+++ b/src/components/views/toasts/VerificationRequestToast.tsx
@@ -38,7 +38,7 @@ interface IProps {
 interface IState {
     counter: number;
     device?: DeviceInfo;
-    IP?: string;
+    ip?: string;
 }
 
 export default class VerificationRequestToast extends React.PureComponent<IProps, IState> {
@@ -71,10 +71,10 @@ export default class VerificationRequestToast extends React.PureComponent<IProps
         if (request.isSelfVerification) {
             const cli = MatrixClientPeg.get();
             const device = await cli.getDevice(request.channel.deviceId);
-            const IP = device.last_seen_ip;
+            const ip = device.last_seen_ip;
             this.setState({
                 device: cli.getStoredDevice(cli.getUserId(), request.channel.deviceId),
-                IP,
+                ip,
             });
         }
     }
@@ -141,10 +141,10 @@ export default class VerificationRequestToast extends React.PureComponent<IProps
         let nameLabel;
         if (request.isSelfVerification) {
             if (this.state.device) {
-                nameLabel = _t("From %(deviceName)s (%(deviceId)s) from %(IP)s", {
+                nameLabel = _t("From %(deviceName)s (%(deviceId)s) at %(ip)s", {
                     deviceName: this.state.device.getDisplayName(),
                     deviceId: this.state.device.deviceId,
-                    IP: this.state.IP,
+                    ip: this.state.ip,
                 });
             }
         } else {
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 51d3561e2c..98a0ceb5d1 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -753,7 +753,7 @@
     "Safeguard against losing access to encrypted messages & data": "Safeguard against losing access to encrypted messages & data",
     "Other users may not trust it": "Other users may not trust it",
     "New login. Was this you?": "New login. Was this you?",
-    "A new login is accessing your account: %(name)s (%(deviceID)s) from %(IP)s": "A new login is accessing your account: %(name)s (%(deviceID)s) from %(IP)s",
+    "A new login is accessing your account: %(name)s (%(deviceID)s) at %(ip)s": "A new login is accessing your account: %(name)s (%(deviceID)s) at %(ip)s",
     "Check your devices": "Check your devices",
     "What's new?": "What's new?",
     "What's New": "What's New",
@@ -981,7 +981,7 @@
     "Folder": "Folder",
     "Pin": "Pin",
     "Your server isn't responding to some <a>requests</a>.": "Your server isn't responding to some <a>requests</a>.",
-    "From %(deviceName)s (%(deviceId)s) from %(IP)s": "From %(deviceName)s (%(deviceId)s) from %(IP)s",
+    "From %(deviceName)s (%(deviceId)s) at %(ip)s": "From %(deviceName)s (%(deviceId)s) at %(ip)s",
     "Decline (%(counter)s)": "Decline (%(counter)s)",
     "Accept <policyLink /> to continue:": "Accept <policyLink /> to continue:",
     "Delete": "Delete",
diff --git a/src/toasts/UnverifiedSessionToast.ts b/src/toasts/UnverifiedSessionToast.ts
index d375ef6112..e0ea323033 100644
--- a/src/toasts/UnverifiedSessionToast.ts
+++ b/src/toasts/UnverifiedSessionToast.ts
@@ -50,10 +50,10 @@ export const showToast = async (deviceId: string) => {
         icon: "verification_warning",
         props: {
             description: _t(
-                "A new login is accessing your account: %(name)s (%(deviceID)s) from %(IP)s", {
+                "A new login is accessing your account: %(name)s (%(deviceID)s) at %(ip)s", {
                     name: device.display_name,
                     deviceID: deviceId,
-                    IP: device.last_seen_ip,
+                    ip: device.last_seen_ip,
                 },
             ),
             acceptLabel: _t("Check your devices"),

From 14b828ecc63652d7aac081c28bafd07fa8119d61 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 8 Mar 2021 17:58:30 +0000
Subject: [PATCH 208/420] shorten verify button label

---
 src/components/structures/auth/SetupEncryptionBody.js | 2 +-
 src/i18n/strings/en_EN.json                           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/auth/SetupEncryptionBody.js b/src/components/structures/auth/SetupEncryptionBody.js
index 4e3d106eb1..431762cade 100644
--- a/src/components/structures/auth/SetupEncryptionBody.js
+++ b/src/components/structures/auth/SetupEncryptionBody.js
@@ -152,7 +152,7 @@ export default class SetupEncryptionBody extends React.Component {
             let verifyButton;
             if (store.hasDevicesToVerifyAgainst) {
                 verifyButton = <AccessibleButton kind="primary" onClick={this._onVerifyClick}>
-                    { _t("Verify against another session") }
+                    { _t("Verify with another session") }
                 </AccessibleButton>;
             }
 
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 98a0ceb5d1..68664fa0dd 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2714,7 +2714,7 @@
     "Decide where your account is hosted": "Decide where your account is hosted",
     "Use Security Key or Phrase": "Use Security Key or Phrase",
     "Use Security Key": "Use Security Key",
-    "Verify against another session": "Verify against another session",
+    "Verify with another session": "Verify with another session",
     "Verify this login to access your encrypted messages and prove to others that this login is really you.": "Verify this login to access your encrypted messages and prove to others that this login is really you.",
     "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.",
     "Your new session is now verified. Other users will see it as trusted.": "Your new session is now verified. Other users will see it as trusted.",

From b3cd6fcc9bf11d5070dd5697ee8756dc6bde34f2 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 8 Mar 2021 17:59:02 +0000
Subject: [PATCH 209/420] vertically align labels in AccessibleButtons if their
 height is pushed out by wrapped text elsewhere

---
 res/css/views/elements/_AccessibleButton.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/res/css/views/elements/_AccessibleButton.scss b/res/css/views/elements/_AccessibleButton.scss
index 9c26f8f120..b115130c8f 100644
--- a/res/css/views/elements/_AccessibleButton.scss
+++ b/res/css/views/elements/_AccessibleButton.scss
@@ -26,7 +26,8 @@ limitations under the License.
     padding: 7px 18px;
     text-align: center;
     border-radius: 8px;
-    display: inline-block;
+    display: flex;
+    align-items: center;
     font-size: $font-14px;
 }
 

From 9d99b2f239e1bb6c7179239aa0729bbac122f987 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 8 Mar 2021 17:59:10 +0000
Subject: [PATCH 210/420] remove errand whitespace

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

diff --git a/src/stores/SetupEncryptionStore.js b/src/stores/SetupEncryptionStore.js
index fdabfa8019..2ed778b294 100644
--- a/src/stores/SetupEncryptionStore.js
+++ b/src/stores/SetupEncryptionStore.js
@@ -49,7 +49,6 @@ export class SetupEncryptionStore extends EventEmitter {
         cli.on("crypto.verification.request", this.onVerificationRequest);
         cli.on('userTrustStatusChanged', this._onUserTrustStatusChanged);
 
-
         const requestsInProgress = cli.getVerificationRequestsToDeviceInProgress(cli.getUserId());
         if (requestsInProgress.length) {
             // If there are multiple, we take the most recent. Equally if the user sends another request from

From 92c8b697d21607cb9a5e3093d0db550f1bc2dfd5 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 8 Mar 2021 18:55:33 +0000
Subject: [PATCH 211/420] Fix units of TURN server expiry time

---
 src/CallHandler.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/CallHandler.tsx b/src/CallHandler.tsx
index 8621f441de..d2564e637b 100644
--- a/src/CallHandler.tsx
+++ b/src/CallHandler.tsx
@@ -630,7 +630,7 @@ export default class CallHandler {
         logger.debug("Mapped real room " + roomId + " to room ID " + mappedRoomId);
 
         const timeUntilTurnCresExpire = MatrixClientPeg.get().getTurnServersExpiry() - Date.now();
-        console.log("Current turn creds expire in " + timeUntilTurnCresExpire + " seconds");
+        console.log("Current turn creds expire in " + timeUntilTurnCresExpire + " ms");
         const call = createNewMatrixCall(MatrixClientPeg.get(), mappedRoomId);
 
         this.calls.set(roomId, call);

From 7963d7f49ebc7da5387bd8037f14ce13ae4f55cd Mon Sep 17 00:00:00 2001
From: Panagiotis <27917356+panoschal@users.noreply.github.com>
Date: Mon, 8 Mar 2021 21:21:37 +0200
Subject: [PATCH 212/420] address PR comments

cleanup, change to isEncrypted, comments
---
 .../views/context_menus/MessageContextMenu.js     | 15 ++-------------
 .../views/messages/EditHistoryMessage.js          |  3 ++-
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js
index b002d1ec62..98d0aad578 100644
--- a/src/components/views/context_menus/MessageContextMenu.js
+++ b/src/components/views/context_menus/MessageContextMenu.js
@@ -130,20 +130,9 @@ export default class MessageContextMenu extends React.Component {
             roomId: ev.getRoomId(),
             eventId: ev.getId(),
             content: ev.event,
-            isEncrypted: this.props.mxEvent.getType() !== this.props.mxEvent.getWireType(),
-            decryptedContent: ev._clearEvent,
-        }, 'mx_Dialog_viewsource');
-        this.closeMenu();
-    };
-
-    onViewClearSourceClick = () => {
-        const ev = this.props.mxEvent.replacingEvent() || this.props.mxEvent;
-        const ViewSource = sdk.getComponent('structures.ViewSource');
-        Modal.createTrackedDialog('View Clear Event Source', '', ViewSource, {
-            roomId: ev.getRoomId(),
-            eventId: ev.getId(),
+            isEncrypted: ev.isEncrypted(),
             // FIXME: _clearEvent is private
-            content: ev._clearEvent,
+            decryptedContent: ev._clearEvent,
         }, 'mx_Dialog_viewsource');
         this.closeMenu();
     };
diff --git a/src/components/views/messages/EditHistoryMessage.js b/src/components/views/messages/EditHistoryMessage.js
index 68a3c95745..f37efe4800 100644
--- a/src/components/views/messages/EditHistoryMessage.js
+++ b/src/components/views/messages/EditHistoryMessage.js
@@ -77,7 +77,8 @@ export default class EditHistoryMessage extends React.PureComponent {
             roomId: this.props.mxEvent.getRoomId(),
             eventId: this.props.mxEvent.getId(),
             content: this.props.mxEvent.event,
-            isEncrypted: this.props.mxEvent.getType() !== this.props.mxEvent.getWireType(),
+            isEncrypted: this.props.mxEvent.isEncrypted(),
+            // FIXME: _clearEvent is private
             decryptedContent: this.props.mxEvent._clearEvent,
         }, 'mx_Dialog_viewsource');
     };

From 9287e8dfa4f55b368a3c108d3c15442cdfdc4c1c Mon Sep 17 00:00:00 2001
From: Panagiotis <27917356+panoschal@users.noreply.github.com>
Date: Mon, 8 Mar 2021 22:15:34 +0200
Subject: [PATCH 213/420] use isEncrypted, edit state events

---
 src/components/structures/ViewSource.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/structures/ViewSource.js b/src/components/structures/ViewSource.js
index ddcffe4f7f..cfe28e9f73 100644
--- a/src/components/structures/ViewSource.js
+++ b/src/components/structures/ViewSource.js
@@ -51,7 +51,7 @@ export default class ViewSource extends React.Component {
     // returns the dialog body for viewing the event source
     viewSourceContent() {
         const mxEvent = this.props.mxEvent.replacingEvent() || this.props.mxEvent; // show the replacing event, not the original, if it is an edit
-        const isEncrypted = this.props.mxEvent.getType() !== this.props.mxEvent.getWireType();
+        const isEncrypted = mxEvent.isEncrypted();
         const decryptedEventSource = mxEvent._clearEvent; // FIXME: _clearEvent is private
         const originalEventSource = mxEvent.event;
 
@@ -85,7 +85,7 @@ export default class ViewSource extends React.Component {
     // returns the id of the initial message, not the id of the previous edit
     getBaseEventId() {
         const mxEvent = this.props.mxEvent.replacingEvent() || this.props.mxEvent; // show the replacing event, not the original, if it is an edit
-        const isEncrypted = this.props.mxEvent.getType() !== this.props.mxEvent.getWireType();
+        const isEncrypted = mxEvent.isEncrypted();
         const baseMxEvent = this.props.mxEvent;
 
         if (isEncrypted) {
@@ -163,7 +163,7 @@ export default class ViewSource extends React.Component {
         const isEditing = this.state.isEditing;
         const roomId = mxEvent.getRoomId();
         const eventId = mxEvent.getId();
-        const canEdit = canEditContent(this.props.mxEvent);
+        const canEdit = canEditContent(this.props.mxEvent) || mxEvent.isState();
         return (
             <BaseDialog className="mx_ViewSource" onFinished={this.props.onFinished} title={_t("View Source")}>
                 <div>

From c543f0a2d0d7178e6c7efb271315c674b443fb28 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 8 Mar 2021 22:29:08 +0000
Subject: [PATCH 214/420] fix AccessibleButton label positioning now they can
 wrap

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

diff --git a/res/css/views/elements/_AccessibleButton.scss b/res/css/views/elements/_AccessibleButton.scss
index b115130c8f..e13f765e63 100644
--- a/res/css/views/elements/_AccessibleButton.scss
+++ b/res/css/views/elements/_AccessibleButton.scss
@@ -28,6 +28,7 @@ limitations under the License.
     border-radius: 8px;
     display: flex;
     align-items: center;
+    justify-content: center;
     font-size: $font-14px;
 }
 

From bb8fe62c5c77ebaa407e42b2fdb8f5228911a29a Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Mon, 8 Mar 2021 23:11:44 +0000
Subject: [PATCH 215/420] Translated using Weblate (German)

Currently translated at 99.5% (2767 of 2780 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
---
 src/i18n/strings/de_DE.json | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 07a1a4f805..7304d35fcd 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1433,7 +1433,7 @@
     "Never send encrypted messages to unverified sessions in this room from this session": "Sende niemals verschlüsselte Nachrichten von dieser Sitzung zu unverifizierten Sitzungen in diesem Raum",
     "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Durch die Änderung des Passworts werden derzeit alle Ende-zu-Ende-Verschlüsselungsschlüssel in allen Sitzungen zurückgesetzt, sodass der verschlüsselte Chat-Verlauf nicht mehr lesbar ist, es sei denn, du exportierst zuerst deine Raumschlüssel und importierst sie anschließend wieder. In Zukunft wird dies verbessert werden.",
     "Delete %(count)s sessions|other": "%(count)s Sitzungen löschen",
-    "Backup is not signed by any of your sessions": "Die Sicherung wurde von keiner deiner Sitzungen unterzeichnet",
+    "Backup is not signed by any of your sessions": "Die Sicherung wurde von keiner deiner Sitzungen bestätigt",
     "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Dein Passwort wurde erfolgreich geändert. Du erhältst keine Push-Benachrichtigungen zu anderen Sitzungen, bis du dich wieder bei diesen anmeldest",
     "Notification sound": "Benachrichtigungston",
     "Set a new custom sound": "Setze einen neuen benutzerdefinierten Ton",
@@ -2060,7 +2060,7 @@
     "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 kann nicht geteilt werden",
-    "Please enter verification code sent via text.": "Gib den Verifikationscode ein, den du empfangen hast.",
+    "Please enter verification code sent via text.": "Gib den Bestätigungscode ein, den du empfangen hast.",
     "Almost there! Is your other session showing the same shield?": "Fast geschafft! Zeigt deine andere Sitzung das gleiche Schild?",
     "Almost there! Is %(displayName)s showing the same shield?": "Fast geschafft! Wird bei %(displayName)s das gleiche Schild 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.",
@@ -3072,5 +3072,9 @@
     "Failed to save settings": "Einstellungen konnten nicht gespeichert werden",
     "Show chat effects (animations when receiving e.g. confetti)": "Animierte Chateffekte zeigen, wenn z.B. Konfetti-Emojis erhalten werden",
     "Save setting values": "Einstellungswerte speichern",
-    "Caution:": "Vorsicht:"
+    "Caution:": "Vorsicht:",
+    "Settable at global": "Global festlegbar",
+    "Setting definition:": "Definition der Einstellung:",
+    "Value in this room": "Wert in diesem Raum",
+    "Settings Explorer": "Einstellungs-Explorer"
 }

From d388f877b463cdc16dfb5e4cb0e649502871af81 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 8 Mar 2021 23:28:44 +0000
Subject: [PATCH 216/420] add PHASE_LOADING to SetupEncryptionStore to avoid
 flashing cross-signing setup

---
 src/components/structures/auth/CompleteSecurity.js  |  5 ++++-
 .../structures/auth/SetupEncryptionBody.js          |  3 ++-
 src/stores/SetupEncryptionStore.js                  | 13 +++++++------
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/components/structures/auth/CompleteSecurity.js b/src/components/structures/auth/CompleteSecurity.js
index c73691611d..b18776e0ea 100644
--- a/src/components/structures/auth/CompleteSecurity.js
+++ b/src/components/structures/auth/CompleteSecurity.js
@@ -20,6 +20,7 @@ import { _t } from '../../../languageHandler';
 import * as sdk from '../../../index';
 import {
     SetupEncryptionStore,
+    PHASE_LOADING,
     PHASE_INTRO,
     PHASE_BUSY,
     PHASE_DONE,
@@ -58,7 +59,9 @@ export default class CompleteSecurity extends React.Component {
         let icon;
         let title;
 
-        if (phase === PHASE_INTRO) {
+        if (phase === PHASE_LOADING) {
+            return null;
+        } else if (phase === PHASE_INTRO) {
             icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_warning" />;
             title = _t("Verify this login");
         } else if (phase === PHASE_DONE) {
diff --git a/src/components/structures/auth/SetupEncryptionBody.js b/src/components/structures/auth/SetupEncryptionBody.js
index 431762cade..32f0f41024 100644
--- a/src/components/structures/auth/SetupEncryptionBody.js
+++ b/src/components/structures/auth/SetupEncryptionBody.js
@@ -23,6 +23,7 @@ import VerificationRequestDialog from '../../views/dialogs/VerificationRequestDi
 import * as sdk from '../../../index';
 import {
     SetupEncryptionStore,
+    PHASE_LOADING,
     PHASE_INTRO,
     PHASE_BUSY,
     PHASE_DONE,
@@ -222,7 +223,7 @@ export default class SetupEncryptionBody extends React.Component {
                     </div>
                 </div>
             );
-        } else if (phase === PHASE_BUSY) {
+        } else if (phase === PHASE_BUSY || phase === PHASE_LOADING) {
             const Spinner = sdk.getComponent('views.elements.Spinner');
             return <Spinner />;
         } else {
diff --git a/src/stores/SetupEncryptionStore.js b/src/stores/SetupEncryptionStore.js
index 2ed778b294..28ab76edc0 100644
--- a/src/stores/SetupEncryptionStore.js
+++ b/src/stores/SetupEncryptionStore.js
@@ -19,11 +19,12 @@ import { MatrixClientPeg } from '../MatrixClientPeg';
 import { accessSecretStorage, AccessCancelledError } from '../SecurityManager';
 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;
-export const PHASE_DONE = 2;    //final done stage, but still showing UX
-export const PHASE_CONFIRM_SKIP = 3;
-export const PHASE_FINISHED = 4; //UX can be closed
+export const PHASE_LOADING = 0;
+export const PHASE_INTRO = 1;
+export const PHASE_BUSY = 2;
+export const PHASE_DONE = 3;    //final done stage, but still showing UX
+export const PHASE_CONFIRM_SKIP = 4;
+export const PHASE_FINISHED = 5; //UX can be closed
 
 export class SetupEncryptionStore extends EventEmitter {
     static sharedInstance() {
@@ -36,7 +37,7 @@ export class SetupEncryptionStore extends EventEmitter {
             return;
         }
         this._started = true;
-        this.phase = PHASE_BUSY;
+        this.phase = PHASE_LOADING;
         this.verificationRequest = null;
         this.backupInfo = null;
 

From 72f28240aa7fc274e70035af24ce908633fc1630 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 8 Mar 2021 23:28:54 +0000
Subject: [PATCH 217/420] fix AccessibleButton layout some more

---
 res/css/views/elements/_AccessibleButton.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/views/elements/_AccessibleButton.scss b/res/css/views/elements/_AccessibleButton.scss
index e13f765e63..0075dcb511 100644
--- a/res/css/views/elements/_AccessibleButton.scss
+++ b/res/css/views/elements/_AccessibleButton.scss
@@ -26,7 +26,7 @@ limitations under the License.
     padding: 7px 18px;
     text-align: center;
     border-radius: 8px;
-    display: flex;
+    display: inline-flex;
     align-items: center;
     justify-content: center;
     font-size: $font-14px;

From 92af111c930a067af0a287338f173cb1b876fb3e Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 8 Mar 2021 19:19:52 -0700
Subject: [PATCH 218/420] Fix types for replaceableComponent

This is to make it work in TS files
---
 src/utils/replaceableComponent.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/utils/replaceableComponent.ts b/src/utils/replaceableComponent.ts
index 8c29fdf037..f8dd5f8ac6 100644
--- a/src/utils/replaceableComponent.ts
+++ b/src/utils/replaceableComponent.ts
@@ -30,9 +30,11 @@ import * as sdk from '../index';
  * @param {string} name The dot-path name of the component being replaced.
  * @param {React.Component} origComponent The component that can be replaced
  * with a skinned version. If no skinned version is available, this component
- * will be used.
+ * will be used. Note that this is automatically provided to the function and
+ * thus is optional for purposes of types.
+ * @returns {ClassDecorator} The decorator.
  */
-export function replaceableComponent(name: string, origComponent: React.Component) {
+export function replaceableComponent(name: string, origComponent?: React.Component): ClassDecorator {
     // Decorators return a function to override the class (origComponent). This
     // ultimately assumes that `getComponent()` won't throw an error and instead
     // return a falsey value like `null` when the skin doesn't have a component.

From a5f237dfd6094decab5defe71c75ba608973d262 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 8 Mar 2021 19:33:10 -0700
Subject: [PATCH 219/420] Make debugging skinning problems easier

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

diff --git a/src/Skinner.js b/src/Skinner.js
index d17bc1782a..ef340e4052 100644
--- a/src/Skinner.js
+++ b/src/Skinner.js
@@ -23,7 +23,7 @@ class Skinner {
         if (!name) throw new Error(`Invalid component name: ${name}`);
         if (this.components === null) {
             throw new Error(
-                "Attempted to get a component before a skin has been loaded."+
+                `Attempted to get a component (${name}) before a skin has been loaded.`+
                 " This is probably because either:"+
                 " a) Your app has not called sdk.loadSkin(), or"+
                 " b) A component has called getComponent at the root level",

From c230a75eda74622df6b923eb6091286740094637 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 8 Mar 2021 19:35:10 -0700
Subject: [PATCH 220/420] Flag structural components as replaceable

---
 src/components/structures/ContextMenu.tsx             | 3 +++
 src/components/structures/CustomRoomTagPanel.js       | 2 ++
 src/components/structures/FilePanel.js                | 2 ++
 src/components/structures/GenericErrorPage.js         | 2 ++
 src/components/structures/GroupFilterPanel.js         | 2 ++
 src/components/structures/GroupView.js                | 2 ++
 src/components/structures/HostSignupAction.tsx        | 2 ++
 src/components/structures/IndicatorScrollbar.js       | 2 ++
 src/components/structures/InteractiveAuth.js          | 2 ++
 src/components/structures/LeftPanel.tsx               | 2 ++
 src/components/structures/LoggedInView.tsx            | 2 ++
 src/components/structures/MainSplit.js                | 2 ++
 src/components/structures/MatrixChat.tsx              | 2 ++
 src/components/structures/MessagePanel.js             | 2 ++
 src/components/structures/MyGroups.js                 | 2 ++
 src/components/structures/NonUrgentToastContainer.tsx | 2 ++
 src/components/structures/NotificationPanel.js        | 2 ++
 src/components/structures/RightPanel.js               | 2 ++
 src/components/structures/RoomDirectory.js            | 2 ++
 src/components/structures/RoomSearch.tsx              | 2 ++
 src/components/structures/RoomStatusBar.js            | 2 ++
 src/components/structures/RoomView.tsx                | 2 ++
 src/components/structures/ScrollPanel.js              | 2 ++
 src/components/structures/SearchBox.js                | 2 ++
 src/components/structures/TabbedView.tsx              | 2 ++
 src/components/structures/TimelinePanel.js            | 2 ++
 src/components/structures/ToastContainer.tsx          | 2 ++
 src/components/structures/UploadBar.tsx               | 2 ++
 src/components/structures/UserMenu.tsx                | 2 ++
 src/components/structures/UserView.js                 | 2 ++
 src/components/structures/ViewSource.js               | 2 ++
 src/components/structures/auth/CompleteSecurity.js    | 2 ++
 src/components/structures/auth/E2eSetup.js            | 2 ++
 src/components/structures/auth/ForgotPassword.js      | 2 ++
 src/components/structures/auth/Login.tsx              | 2 ++
 src/components/structures/auth/Registration.tsx       | 2 ++
 src/components/structures/auth/SetupEncryptionBody.js | 2 ++
 src/components/structures/auth/SoftLogout.js          | 2 ++
 38 files changed, 77 insertions(+)

diff --git a/src/components/structures/ContextMenu.tsx b/src/components/structures/ContextMenu.tsx
index 726ff547ff..9d9d57d8a6 100644
--- a/src/components/structures/ContextMenu.tsx
+++ b/src/components/structures/ContextMenu.tsx
@@ -22,6 +22,7 @@ import classNames from "classnames";
 
 import {Key} from "../../Keyboard";
 import {Writeable} from "../../@types/common";
+import {replaceableComponent} from "../../utils/replaceableComponent";
 
 // Shamelessly ripped off Modal.js.  There's probably a better way
 // of doing reusable widgets like dialog boxes & menus where we go and
@@ -91,6 +92,7 @@ interface IState {
 // Generic ContextMenu Portal wrapper
 // all options inside the menu should be of role=menuitem/menuitemcheckbox/menuitemradiobutton and have tabIndex={-1}
 // this will allow the ContextMenu to manage its own focus using arrow keys as per the ARIA guidelines.
+@replaceableComponent("structures.ContextMenu")
 export class ContextMenu extends React.PureComponent<IProps, IState> {
     private initialFocus: HTMLElement;
 
@@ -467,6 +469,7 @@ export const useContextMenu = <T extends any = HTMLElement>(): ContextMenuTuple<
     return [isOpen, button, open, close, setIsOpen];
 };
 
+@replaceableComponent("structures.LegacyContextMenu")
 export default class LegacyContextMenu extends ContextMenu {
     render() {
         return this.renderMenu(false);
diff --git a/src/components/structures/CustomRoomTagPanel.js b/src/components/structures/CustomRoomTagPanel.js
index a79bdafeb5..73359f17a5 100644
--- a/src/components/structures/CustomRoomTagPanel.js
+++ b/src/components/structures/CustomRoomTagPanel.js
@@ -21,7 +21,9 @@ import * as sdk from '../../index';
 import dis from '../../dispatcher/dispatcher';
 import classNames from 'classnames';
 import * as FormattingUtils from '../../utils/FormattingUtils';
+import {replaceableComponent} from "../../utils/replaceableComponent";
 
+@replaceableComponent("structures.CustomRoomTagPanel")
 class CustomRoomTagPanel extends React.Component {
     constructor(props) {
         super(props);
diff --git a/src/components/structures/FilePanel.js b/src/components/structures/FilePanel.js
index 0e4df4621d..9f5a0b6211 100644
--- a/src/components/structures/FilePanel.js
+++ b/src/components/structures/FilePanel.js
@@ -26,10 +26,12 @@ import { _t } from '../../languageHandler';
 import BaseCard from "../views/right_panel/BaseCard";
 import {RightPanelPhases} from "../../stores/RightPanelStorePhases";
 import DesktopBuildsNotice, {WarningKind} from "../views/elements/DesktopBuildsNotice";
+import {replaceableComponent} from "../../utils/replaceableComponent";
 
 /*
  * Component which shows the filtered file using a TimelinePanel
  */
+@replaceableComponent("structures.FilePanel")
 class FilePanel extends React.Component {
     static propTypes = {
         roomId: PropTypes.string.isRequired,
diff --git a/src/components/structures/GenericErrorPage.js b/src/components/structures/GenericErrorPage.js
index ab7d4f9311..cfd2016d47 100644
--- a/src/components/structures/GenericErrorPage.js
+++ b/src/components/structures/GenericErrorPage.js
@@ -16,7 +16,9 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
+import {replaceableComponent} from "../../utils/replaceableComponent";
 
+@replaceableComponent("structures.GenericErrorPage")
 export default class GenericErrorPage extends React.PureComponent {
     static propTypes = {
         title: PropTypes.object.isRequired, // jsx for title
diff --git a/src/components/structures/GroupFilterPanel.js b/src/components/structures/GroupFilterPanel.js
index 96aa1ba728..976b2d81a5 100644
--- a/src/components/structures/GroupFilterPanel.js
+++ b/src/components/structures/GroupFilterPanel.js
@@ -30,7 +30,9 @@ import MatrixClientContext from "../../contexts/MatrixClientContext";
 import AutoHideScrollbar from "./AutoHideScrollbar";
 import SettingsStore from "../../settings/SettingsStore";
 import UserTagTile from "../views/elements/UserTagTile";
+import {replaceableComponent} from "../../utils/replaceableComponent";
 
+@replaceableComponent("structures.GroupFilterPanel")
 class GroupFilterPanel extends React.Component {
     static contextType = MatrixClientContext;
 
diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index bbc4187298..b4b871a0b4 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -39,6 +39,7 @@ import {Group} from "matrix-js-sdk";
 import {allSettled, sleep} from "../../utils/promise";
 import RightPanelStore from "../../stores/RightPanelStore";
 import AutoHideScrollbar from "./AutoHideScrollbar";
+import {replaceableComponent} from "../../utils/replaceableComponent";
 
 const LONG_DESC_PLACEHOLDER = _td(
 `<h1>HTML for your community's page</h1>
@@ -391,6 +392,7 @@ class FeaturedUser extends React.Component {
 const GROUP_JOINPOLICY_OPEN = "open";
 const GROUP_JOINPOLICY_INVITE = "invite";
 
+@replaceableComponent("structures.GroupView")
 export default class GroupView extends React.Component {
     static propTypes = {
         groupId: PropTypes.string.isRequired,
diff --git a/src/components/structures/HostSignupAction.tsx b/src/components/structures/HostSignupAction.tsx
index 9cf84a9379..769775d549 100644
--- a/src/components/structures/HostSignupAction.tsx
+++ b/src/components/structures/HostSignupAction.tsx
@@ -22,11 +22,13 @@ import {
 import { _t } from "../../languageHandler";
 import { HostSignupStore } from "../../stores/HostSignupStore";
 import SdkConfig from "../../SdkConfig";
+import {replaceableComponent} from "../../utils/replaceableComponent";
 
 interface IProps {}
 
 interface IState {}
 
+@replaceableComponent("structures.HostSignupAction")
 export default class HostSignupAction extends React.PureComponent<IProps, IState> {
     private openDialog = async () => {
         await HostSignupStore.instance.setHostSignupActive(true);
diff --git a/src/components/structures/IndicatorScrollbar.js b/src/components/structures/IndicatorScrollbar.js
index cd5510de9d..341ab2df71 100644
--- a/src/components/structures/IndicatorScrollbar.js
+++ b/src/components/structures/IndicatorScrollbar.js
@@ -17,7 +17,9 @@ limitations under the License.
 import React from "react";
 import PropTypes from "prop-types";
 import AutoHideScrollbar from "./AutoHideScrollbar";
+import {replaceableComponent} from "../../utils/replaceableComponent";
 
+@replaceableComponent("structures.IndicatorScrollbar")
 export default class IndicatorScrollbar extends React.Component {
     static propTypes = {
         // If true, the scrollbar will append mx_IndicatorScrollbar_leftOverflowIndicator
diff --git a/src/components/structures/InteractiveAuth.js b/src/components/structures/InteractiveAuth.js
index ac7049ed88..9b61f71fd7 100644
--- a/src/components/structures/InteractiveAuth.js
+++ b/src/components/structures/InteractiveAuth.js
@@ -22,9 +22,11 @@ import PropTypes from 'prop-types';
 import getEntryComponentForLoginType from '../views/auth/InteractiveAuthEntryComponents';
 
 import * as sdk from '../../index';
+import {replaceableComponent} from "../../utils/replaceableComponent";
 
 export const ERROR_USER_CANCELLED = new Error("User cancelled auth session");
 
+@replaceableComponent("structures.InteractiveAuthComponent")
 export default class InteractiveAuthComponent extends React.Component {
     static propTypes = {
         // matrix client to use for UI auth requests
diff --git a/src/components/structures/LeftPanel.tsx b/src/components/structures/LeftPanel.tsx
index 82dd9443cc..88c7a71b35 100644
--- a/src/components/structures/LeftPanel.tsx
+++ b/src/components/structures/LeftPanel.tsx
@@ -40,6 +40,7 @@ import { MatrixClientPeg } from "../../MatrixClientPeg";
 import RoomListNumResults from "../views/rooms/RoomListNumResults";
 import LeftPanelWidget from "./LeftPanelWidget";
 import SpacePanel from "../views/spaces/SpacePanel";
+import {replaceableComponent} from "../../utils/replaceableComponent";
 
 interface IProps {
     isMinimized: boolean;
@@ -60,6 +61,7 @@ const cssClasses = [
     "mx_RoomSublist_showNButton",
 ];
 
+@replaceableComponent("structures.LeftPanel")
 export default class LeftPanel extends React.Component<IProps, IState> {
     private listContainerRef: React.RefObject<HTMLDivElement> = createRef();
     private groupFilterPanelWatcherRef: string;
diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx
index 3e6d56fd54..15e90a383a 100644
--- a/src/components/structures/LoggedInView.tsx
+++ b/src/components/structures/LoggedInView.tsx
@@ -56,6 +56,7 @@ import Modal from "../../Modal";
 import { ICollapseConfig } from "../../resizer/distributors/collapse";
 import HostSignupContainer from '../views/host_signup/HostSignupContainer';
 import { IOpts } from "../../createRoom";
+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.
@@ -128,6 +129,7 @@ interface IState {
  *
  * Components mounted below us can access the matrix client via the react context.
  */
+@replaceableComponent("structures.LoggedInView")
 class LoggedInView extends React.Component<IProps, IState> {
     static displayName = 'LoggedInView';
 
diff --git a/src/components/structures/MainSplit.js b/src/components/structures/MainSplit.js
index 47dfe83ad6..5818d303fc 100644
--- a/src/components/structures/MainSplit.js
+++ b/src/components/structures/MainSplit.js
@@ -17,7 +17,9 @@ limitations under the License.
 
 import React from 'react';
 import { Resizable } from 're-resizable';
+import {replaceableComponent} from "../../utils/replaceableComponent";
 
+@replaceableComponent("structures.MainSplit")
 export default class MainSplit extends React.Component {
     _onResizeStart = () => {
         this.props.resizeNotifier.startResizing();
diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index 1700b627db..0272633e8f 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -84,6 +84,7 @@ import DialPadModal from "../views/voip/DialPadModal";
 import { showToast as showMobileGuideToast } from '../../toasts/MobileGuideToast';
 import SpaceStore from "../../stores/SpaceStore";
 import SpaceRoomDirectory from "./SpaceRoomDirectory";
+import {replaceableComponent} from "../../utils/replaceableComponent";
 
 /** constants for MatrixChat.state.view */
 export enum Views {
@@ -208,6 +209,7 @@ interface IState {
     roomJustCreatedOpts?: IOpts;
 }
 
+@replaceableComponent("structures.MatrixChat")
 export default class MatrixChat extends React.PureComponent<IProps, IState> {
     static displayName = "MatrixChat";
 
diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 9deda54bee..0f9ef70ec1 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -34,6 +34,7 @@ import {textForEvent} from "../../TextForEvent";
 import IRCTimelineProfileResizer from "../views/elements/IRCTimelineProfileResizer";
 import DMRoomMap from "../../utils/DMRoomMap";
 import NewRoomIntro from "../views/rooms/NewRoomIntro";
+import {replaceableComponent} from "../../utils/replaceableComponent";
 
 const CONTINUATION_MAX_INTERVAL = 5 * 60 * 1000; // 5 minutes
 const continuedTypes = ['m.sticker', 'm.room.message'];
@@ -66,6 +67,7 @@ const isMembershipChange = (e) => e.getType() === 'm.room.member' || e.getType()
 
 /* (almost) stateless UI component which builds the event tiles in the room timeline.
  */
+@replaceableComponent("structures.MessagePanel")
 export default class MessagePanel extends React.Component {
     static propTypes = {
         // true to give the component a 'display: none' style.
diff --git a/src/components/structures/MyGroups.js b/src/components/structures/MyGroups.js
index e0551eecdb..2ab11dad25 100644
--- a/src/components/structures/MyGroups.js
+++ b/src/components/structures/MyGroups.js
@@ -24,7 +24,9 @@ import dis from '../../dispatcher/dispatcher';
 import AccessibleButton from '../views/elements/AccessibleButton';
 import MatrixClientContext from "../../contexts/MatrixClientContext";
 import AutoHideScrollbar from "./AutoHideScrollbar";
+import {replaceableComponent} from "../../utils/replaceableComponent";
 
+@replaceableComponent("structures.MyGroups")
 export default class MyGroups extends React.Component {
     static contextType = MatrixClientContext;
 
diff --git a/src/components/structures/NonUrgentToastContainer.tsx b/src/components/structures/NonUrgentToastContainer.tsx
index 8d415df4dd..7c193ec9d7 100644
--- a/src/components/structures/NonUrgentToastContainer.tsx
+++ b/src/components/structures/NonUrgentToastContainer.tsx
@@ -18,6 +18,7 @@ import * as React from "react";
 import { ComponentClass } from "../../@types/common";
 import NonUrgentToastStore from "../../stores/NonUrgentToastStore";
 import { UPDATE_EVENT } from "../../stores/AsyncStore";
+import {replaceableComponent} from "../../utils/replaceableComponent";
 
 interface IProps {
 }
@@ -26,6 +27,7 @@ interface IState {
     toasts: ComponentClass[],
 }
 
+@replaceableComponent("structures.NonUrgentToastContainer")
 export default class NonUrgentToastContainer extends React.PureComponent<IProps, IState> {
     public constructor(props, context) {
         super(props, context);
diff --git a/src/components/structures/NotificationPanel.js b/src/components/structures/NotificationPanel.js
index b4eb6c187b..41aafc8b13 100644
--- a/src/components/structures/NotificationPanel.js
+++ b/src/components/structures/NotificationPanel.js
@@ -23,10 +23,12 @@ import { _t } from '../../languageHandler';
 import {MatrixClientPeg} from "../../MatrixClientPeg";
 import * as sdk from "../../index";
 import BaseCard from "../views/right_panel/BaseCard";
+import {replaceableComponent} from "../../utils/replaceableComponent";
 
 /*
  * Component which shows the global notification list using a TimelinePanel
  */
+@replaceableComponent("structures.NotificationPanel")
 class NotificationPanel extends React.Component {
     static propTypes = {
         onClose: PropTypes.func.isRequired,
diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index 3d9df2e927..5bcb3b2450 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -34,7 +34,9 @@ import MatrixClientContext from "../../contexts/MatrixClientContext";
 import {Action} from "../../dispatcher/actions";
 import RoomSummaryCard from "../views/right_panel/RoomSummaryCard";
 import WidgetCard from "../views/right_panel/WidgetCard";
+import {replaceableComponent} from "../../utils/replaceableComponent";
 
+@replaceableComponent("structures.RightPanel")
 export default class RightPanel extends React.Component {
     static get propTypes() {
         return {
diff --git a/src/components/structures/RoomDirectory.js b/src/components/structures/RoomDirectory.js
index 7387e1aac0..363c67262b 100644
--- a/src/components/structures/RoomDirectory.js
+++ b/src/components/structures/RoomDirectory.js
@@ -34,6 +34,7 @@ import GroupFilterOrderStore from "../../stores/GroupFilterOrderStore";
 import GroupStore from "../../stores/GroupStore";
 import FlairStore from "../../stores/FlairStore";
 import CountlyAnalytics from "../../CountlyAnalytics";
+import {replaceableComponent} from "../../utils/replaceableComponent";
 
 const MAX_NAME_LENGTH = 80;
 const MAX_TOPIC_LENGTH = 800;
@@ -42,6 +43,7 @@ function track(action) {
     Analytics.trackEvent('RoomDirectory', action);
 }
 
+@replaceableComponent("structures.RoomDirectory")
 export default class RoomDirectory extends React.Component {
     static propTypes = {
         initialText: PropTypes.string,
diff --git a/src/components/structures/RoomSearch.tsx b/src/components/structures/RoomSearch.tsx
index a64e40bc65..fda09f9774 100644
--- a/src/components/structures/RoomSearch.tsx
+++ b/src/components/structures/RoomSearch.tsx
@@ -25,6 +25,7 @@ import AccessibleButton from "../views/elements/AccessibleButton";
 import { Action } from "../../dispatcher/actions";
 import RoomListStore from "../../stores/room-list/RoomListStore";
 import { NameFilterCondition } from "../../stores/room-list/filters/NameFilterCondition";
+import {replaceableComponent} from "../../utils/replaceableComponent";
 
 interface IProps {
     isMinimized: boolean;
@@ -37,6 +38,7 @@ interface IState {
     focused: boolean;
 }
 
+@replaceableComponent("structures.RoomSearch")
 export default class RoomSearch extends React.PureComponent<IProps, IState> {
     private dispatcherRef: string;
     private inputRef: React.RefObject<HTMLInputElement> = createRef();
diff --git a/src/components/structures/RoomStatusBar.js b/src/components/structures/RoomStatusBar.js
index aa4bceba74..8b70998be0 100644
--- a/src/components/structures/RoomStatusBar.js
+++ b/src/components/structures/RoomStatusBar.js
@@ -23,6 +23,7 @@ import Resend from '../../Resend';
 import dis from '../../dispatcher/dispatcher';
 import {messageForResourceLimitError, messageForSendError} from '../../utils/ErrorUtils';
 import {Action} from "../../dispatcher/actions";
+import {replaceableComponent} from "../../utils/replaceableComponent";
 
 const STATUS_BAR_HIDDEN = 0;
 const STATUS_BAR_EXPANDED = 1;
@@ -35,6 +36,7 @@ function getUnsentMessages(room) {
     });
 }
 
+@replaceableComponent("structures.RoomStatusBar")
 export default class RoomStatusBar extends React.Component {
     static propTypes = {
         // the room this statusbar is representing.
diff --git a/src/components/structures/RoomView.tsx b/src/components/structures/RoomView.tsx
index 90f6daf6cb..b57638413b 100644
--- a/src/components/structures/RoomView.tsx
+++ b/src/components/structures/RoomView.tsx
@@ -82,6 +82,7 @@ import { Container, WidgetLayoutStore } from "../../stores/widgets/WidgetLayoutS
 import { objectHasDiff } from "../../utils/objects";
 import SpaceRoomView from "./SpaceRoomView";
 import { IOpts } from "../../createRoom";
+import {replaceableComponent} from "../../utils/replaceableComponent";
 
 const DEBUG = false;
 let debuglog = function(msg: string) {};
@@ -195,6 +196,7 @@ export interface IState {
     dragCounter: number;
 }
 
+@replaceableComponent("structures.RoomView")
 export default class RoomView extends React.Component<IProps, IState> {
     private readonly dispatcherRef: string;
     private readonly roomStoreToken: EventSubscription;
diff --git a/src/components/structures/ScrollPanel.js b/src/components/structures/ScrollPanel.js
index 744400df3c..3a9b2b8a77 100644
--- a/src/components/structures/ScrollPanel.js
+++ b/src/components/structures/ScrollPanel.js
@@ -19,6 +19,7 @@ import PropTypes from 'prop-types';
 import { Key } from '../../Keyboard';
 import Timer from '../../utils/Timer';
 import AutoHideScrollbar from "./AutoHideScrollbar";
+import {replaceableComponent} from "../../utils/replaceableComponent";
 
 const DEBUG_SCROLL = false;
 
@@ -83,6 +84,7 @@ if (DEBUG_SCROLL) {
  * offset as normal.
  */
 
+@replaceableComponent("structures.ScrollPanel")
 export default class ScrollPanel extends React.Component {
     static propTypes = {
         /* stickyBottom: if set to true, then once the user hits the bottom of
diff --git a/src/components/structures/SearchBox.js b/src/components/structures/SearchBox.js
index c1e3ad0cf2..6daa8526bc 100644
--- a/src/components/structures/SearchBox.js
+++ b/src/components/structures/SearchBox.js
@@ -22,7 +22,9 @@ import dis from '../../dispatcher/dispatcher';
 import {throttle} from 'lodash';
 import AccessibleButton from '../../components/views/elements/AccessibleButton';
 import classNames from 'classnames';
+import {replaceableComponent} from "../../utils/replaceableComponent";
 
+@replaceableComponent("structures.SearchBox")
 export default class SearchBox extends React.Component {
     static propTypes = {
         onSearch: PropTypes.func,
diff --git a/src/components/structures/TabbedView.tsx b/src/components/structures/TabbedView.tsx
index 21f9f3f5d6..0097d55cf5 100644
--- a/src/components/structures/TabbedView.tsx
+++ b/src/components/structures/TabbedView.tsx
@@ -20,6 +20,7 @@ import * as React from "react";
 import {_t} from '../../languageHandler';
 import * as sdk from "../../index";
 import AutoHideScrollbar from './AutoHideScrollbar';
+import {replaceableComponent} from "../../utils/replaceableComponent";
 
 /**
  * Represents a tab for the TabbedView.
@@ -45,6 +46,7 @@ interface IState {
     activeTabIndex: number;
 }
 
+@replaceableComponent("structures.TabbedView")
 export default class TabbedView extends React.Component<IProps, IState> {
     constructor(props: IProps) {
         super(props);
diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 6bc1f70ba1..f32b8ed0a9 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -37,6 +37,7 @@ import EditorStateTransfer from '../../utils/EditorStateTransfer';
 import {haveTileForEvent} from "../views/rooms/EventTile";
 import {UIFeature} from "../../settings/UIFeature";
 import {objectHasDiff} from "../../utils/objects";
+import {replaceableComponent} from "../../utils/replaceableComponent";
 
 const PAGINATE_SIZE = 20;
 const INITIAL_SIZE = 20;
@@ -55,6 +56,7 @@ if (DEBUG) {
  *
  * Also responsible for handling and sending read receipts.
  */
+@replaceableComponent("structures.TimelinePanel")
 class TimelinePanel extends React.Component {
     static propTypes = {
         // The js-sdk EventTimelineSet object for the timeline sequence we are
diff --git a/src/components/structures/ToastContainer.tsx b/src/components/structures/ToastContainer.tsx
index 513cca82c3..1fd3e3419f 100644
--- a/src/components/structures/ToastContainer.tsx
+++ b/src/components/structures/ToastContainer.tsx
@@ -17,12 +17,14 @@ limitations under the License.
 import * as React from "react";
 import ToastStore, {IToast} from "../../stores/ToastStore";
 import classNames from "classnames";
+import {replaceableComponent} from "../../utils/replaceableComponent";
 
 interface IState {
     toasts: IToast<any>[];
     countSeen: number;
 }
 
+@replaceableComponent("structures.ToastContainer")
 export default class ToastContainer extends React.Component<{}, IState> {
     constructor(props, context) {
         super(props, context);
diff --git a/src/components/structures/UploadBar.tsx b/src/components/structures/UploadBar.tsx
index b9d157ee00..4a1fd4313d 100644
--- a/src/components/structures/UploadBar.tsx
+++ b/src/components/structures/UploadBar.tsx
@@ -25,6 +25,7 @@ import { Action } from "../../dispatcher/actions";
 import ProgressBar from "../views/elements/ProgressBar";
 import AccessibleButton from "../views/elements/AccessibleButton";
 import { IUpload } from "../../models/IUpload";
+import {replaceableComponent} from "../../utils/replaceableComponent";
 
 interface IProps {
     room: Room;
@@ -35,6 +36,7 @@ interface IState {
     uploadsHere: IUpload[];
 }
 
+@replaceableComponent("structures.UploadBar")
 export default class UploadBar extends React.Component<IProps, IState> {
     private dispatcherRef: string;
     private mounted: boolean;
diff --git a/src/components/structures/UserMenu.tsx b/src/components/structures/UserMenu.tsx
index b31a5f4b8e..0543cc4d07 100644
--- a/src/components/structures/UserMenu.tsx
+++ b/src/components/structures/UserMenu.tsx
@@ -56,6 +56,7 @@ import HostSignupAction from "./HostSignupAction";
 import { IHostSignupConfig } from "../views/dialogs/HostSignupDialogTypes";
 import SpaceStore, { UPDATE_SELECTED_SPACE } from "../../stores/SpaceStore";
 import RoomName from "../views/elements/RoomName";
+import {replaceableComponent} from "../../utils/replaceableComponent";
 
 interface IProps {
     isMinimized: boolean;
@@ -69,6 +70,7 @@ interface IState {
     selectedSpace?: Room;
 }
 
+@replaceableComponent("structures.UserMenu")
 export default class UserMenu extends React.Component<IProps, IState> {
     private dispatcherRef: string;
     private themeWatcherRef: string;
diff --git a/src/components/structures/UserView.js b/src/components/structures/UserView.js
index 8e21771bb9..dc05193ece 100644
--- a/src/components/structures/UserView.js
+++ b/src/components/structures/UserView.js
@@ -23,7 +23,9 @@ import * as sdk from "../../index";
 import Modal from '../../Modal';
 import { _t } from '../../languageHandler';
 import HomePage from "./HomePage";
+import {replaceableComponent} from "../../utils/replaceableComponent";
 
+@replaceableComponent("structures.UserView")
 export default class UserView extends React.Component {
     static get propTypes() {
         return {
diff --git a/src/components/structures/ViewSource.js b/src/components/structures/ViewSource.js
index 0b969784e5..704a1e7275 100644
--- a/src/components/structures/ViewSource.js
+++ b/src/components/structures/ViewSource.js
@@ -21,8 +21,10 @@ import PropTypes from 'prop-types';
 import SyntaxHighlight from '../views/elements/SyntaxHighlight';
 import {_t} from "../../languageHandler";
 import * as sdk from "../../index";
+import {replaceableComponent} from "../../utils/replaceableComponent";
 
 
+@replaceableComponent("structures.ViewSource")
 export default class ViewSource extends React.Component {
     static propTypes = {
         content: PropTypes.object.isRequired,
diff --git a/src/components/structures/auth/CompleteSecurity.js b/src/components/structures/auth/CompleteSecurity.js
index c73691611d..eee5667052 100644
--- a/src/components/structures/auth/CompleteSecurity.js
+++ b/src/components/structures/auth/CompleteSecurity.js
@@ -26,7 +26,9 @@ import {
     PHASE_CONFIRM_SKIP,
 } from '../../../stores/SetupEncryptionStore';
 import SetupEncryptionBody from "./SetupEncryptionBody";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("structures.auth.CompleteSecurity")
 export default class CompleteSecurity extends React.Component {
     static propTypes = {
         onFinished: PropTypes.func.isRequired,
diff --git a/src/components/structures/auth/E2eSetup.js b/src/components/structures/auth/E2eSetup.js
index d97a972718..4e51ae828c 100644
--- a/src/components/structures/auth/E2eSetup.js
+++ b/src/components/structures/auth/E2eSetup.js
@@ -19,7 +19,9 @@ import PropTypes from 'prop-types';
 import AuthPage from '../../views/auth/AuthPage';
 import CompleteSecurityBody from '../../views/auth/CompleteSecurityBody';
 import CreateCrossSigningDialog from '../../views/dialogs/security/CreateCrossSigningDialog';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("structures.auth.E2eSetup")
 export default class E2eSetup extends React.Component {
     static propTypes = {
         onFinished: PropTypes.func.isRequired,
diff --git a/src/components/structures/auth/ForgotPassword.js b/src/components/structures/auth/ForgotPassword.js
index 5a39fe9fd9..31a5de0222 100644
--- a/src/components/structures/auth/ForgotPassword.js
+++ b/src/components/structures/auth/ForgotPassword.js
@@ -27,6 +27,7 @@ import classNames from 'classnames';
 import AuthPage from "../../views/auth/AuthPage";
 import CountlyAnalytics from "../../../CountlyAnalytics";
 import ServerPicker from "../../views/elements/ServerPicker";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 // Phases
 // Show the forgot password inputs
@@ -38,6 +39,7 @@ const PHASE_EMAIL_SENT = 3;
 // User has clicked the link in email and completed reset
 const PHASE_DONE = 4;
 
+@replaceableComponent("structures.auth.ForgotPassword")
 export default class ForgotPassword extends React.Component {
     static propTypes = {
         serverConfig: PropTypes.instanceOf(ValidatedServerConfig).isRequired,
diff --git a/src/components/structures/auth/Login.tsx b/src/components/structures/auth/Login.tsx
index 96fc39a437..3ab73fb9ac 100644
--- a/src/components/structures/auth/Login.tsx
+++ b/src/components/structures/auth/Login.tsx
@@ -35,6 +35,7 @@ import InlineSpinner from "../../views/elements/InlineSpinner";
 import Spinner from "../../views/elements/Spinner";
 import SSOButtons from "../../views/elements/SSOButtons";
 import ServerPicker from "../../views/elements/ServerPicker";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 // These are used in several places, and come from the js-sdk's autodiscovery
 // stuff. We define them here so that they'll be picked up by i18n.
@@ -99,6 +100,7 @@ interface IState {
 /*
  * A wire component which glues together login UI components and Login logic
  */
+@replaceableComponent("structures.auth.LoginComponent")
 export default class LoginComponent extends React.PureComponent<IProps, IState> {
     private unmounted = false;
     private loginLogic: Login;
diff --git a/src/components/structures/auth/Registration.tsx b/src/components/structures/auth/Registration.tsx
index f9d338902c..32bdddb82a 100644
--- a/src/components/structures/auth/Registration.tsx
+++ b/src/components/structures/auth/Registration.tsx
@@ -30,6 +30,7 @@ import Login, {ISSOFlow} from "../../../Login";
 import dis from "../../../dispatcher/dispatcher";
 import SSOButtons from "../../views/elements/SSOButtons";
 import ServerPicker from '../../views/elements/ServerPicker';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 interface IProps {
     serverConfig: ValidatedServerConfig;
@@ -109,6 +110,7 @@ interface IState {
     ssoFlow?: ISSOFlow;
 }
 
+@replaceableComponent("structures.auth.Registration")
 export default class Registration extends React.Component<IProps, IState> {
     loginLogic: Login;
 
diff --git a/src/components/structures/auth/SetupEncryptionBody.js b/src/components/structures/auth/SetupEncryptionBody.js
index 3e7264dfec..f66c434edd 100644
--- a/src/components/structures/auth/SetupEncryptionBody.js
+++ b/src/components/structures/auth/SetupEncryptionBody.js
@@ -28,6 +28,7 @@ import {
     PHASE_CONFIRM_SKIP,
     PHASE_FINISHED,
 } from '../../../stores/SetupEncryptionStore';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 function keyHasPassphrase(keyInfo) {
     return (
@@ -37,6 +38,7 @@ function keyHasPassphrase(keyInfo) {
     );
 }
 
+@replaceableComponent("structures.auth.SetupEncryptionBody")
 export default class SetupEncryptionBody extends React.Component {
     static propTypes = {
         onFinished: PropTypes.func.isRequired,
diff --git a/src/components/structures/auth/SoftLogout.js b/src/components/structures/auth/SoftLogout.js
index a7fe340457..08db3b2efe 100644
--- a/src/components/structures/auth/SoftLogout.js
+++ b/src/components/structures/auth/SoftLogout.js
@@ -26,6 +26,7 @@ import {sendLoginRequest} from "../../../Login";
 import AuthPage from "../../views/auth/AuthPage";
 import {SSO_HOMESERVER_URL_KEY, SSO_ID_SERVER_URL_KEY} from "../../../BasePlatform";
 import SSOButtons from "../../views/elements/SSOButtons";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 const LOGIN_VIEW = {
     LOADING: 1,
@@ -41,6 +42,7 @@ const FLOWS_TO_VIEWS = {
     "m.login.sso": LOGIN_VIEW.SSO,
 };
 
+@replaceableComponent("structures.auth.SoftLogout")
 export default class SoftLogout extends React.Component {
     static propTypes = {
         // Query parameters from MatrixChat

From 3e189d2728393bb9b77cd55609679abd1bceba49 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 8 Mar 2021 19:45:39 -0700
Subject: [PATCH 221/420] Batch of views getting replaceableComponent
 decorators

---
 src/components/views/auth/AuthBody.js                     | 2 ++
 src/components/views/auth/AuthFooter.js                   | 2 ++
 src/components/views/auth/AuthHeader.js                   | 2 ++
 src/components/views/auth/AuthHeaderLogo.js               | 2 ++
 src/components/views/auth/CaptchaForm.js                  | 2 ++
 src/components/views/auth/CompleteSecurityBody.js         | 2 ++
 src/components/views/auth/CountryDropdown.js              | 2 ++
 .../views/auth/InteractiveAuthEntryComponents.js          | 8 ++++++++
 src/components/views/auth/PassphraseField.tsx             | 2 ++
 src/components/views/auth/PasswordLogin.tsx               | 2 ++
 src/components/views/auth/RegistrationForm.tsx            | 2 ++
 src/components/views/auth/Welcome.js                      | 2 ++
 src/components/views/avatars/DecoratedRoomAvatar.tsx      | 2 ++
 src/components/views/avatars/GroupAvatar.tsx              | 2 ++
 src/components/views/avatars/MemberAvatar.tsx             | 2 ++
 src/components/views/avatars/MemberStatusMessageAvatar.js | 2 ++
 src/components/views/avatars/RoomAvatar.tsx               | 2 ++
 src/components/views/context_menus/CallContextMenu.tsx    | 2 ++
 src/components/views/context_menus/DialpadContextMenu.tsx | 2 ++
 .../views/context_menus/GenericElementContextMenu.js      | 2 ++
 .../views/context_menus/GenericTextContextMenu.js         | 2 ++
 .../views/context_menus/GroupInviteTileContextMenu.js     | 2 ++
 src/components/views/context_menus/MessageContextMenu.js  | 2 ++
 .../views/context_menus/StatusMessageContextMenu.js       | 2 ++
 src/components/views/context_menus/TagTileContextMenu.js  | 2 ++
 src/components/views/dialogs/AddressPickerDialog.js       | 3 ++-
 src/components/views/dialogs/AskInviteAnywayDialog.js     | 2 ++
 src/components/views/dialogs/BaseDialog.js                | 2 ++
 src/components/views/dialogs/BugReportDialog.js           | 2 ++
 .../views/dialogs/CommunityPrototypeInviteDialog.tsx      | 2 ++
 .../views/dialogs/ConfirmAndWaitRedactDialog.js           | 2 ++
 src/components/views/dialogs/ConfirmRedactDialog.js       | 2 ++
 src/components/views/dialogs/ConfirmUserActionDialog.js   | 2 ++
 .../dialogs/security/ConfirmDestroyCrossSigningDialog.js  | 2 ++
 .../views/dialogs/security/CreateCrossSigningDialog.js    | 2 ++
 .../views/dialogs/security/SetupEncryptionDialog.js       | 2 ++
 36 files changed, 78 insertions(+), 1 deletion(-)

diff --git a/src/components/views/auth/AuthBody.js b/src/components/views/auth/AuthBody.js
index 9a078efb52..fa7ad2b285 100644
--- a/src/components/views/auth/AuthBody.js
+++ b/src/components/views/auth/AuthBody.js
@@ -17,7 +17,9 @@ limitations under the License.
 'use strict';
 
 import React from 'react';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.auth.AuthBody")
 export default class AuthBody extends React.PureComponent {
     render() {
         return <div className="mx_AuthBody">
diff --git a/src/components/views/auth/AuthFooter.js b/src/components/views/auth/AuthFooter.js
index 3de5a19350..f167e16283 100644
--- a/src/components/views/auth/AuthFooter.js
+++ b/src/components/views/auth/AuthFooter.js
@@ -18,7 +18,9 @@ limitations under the License.
 
 import { _t } from '../../../languageHandler';
 import React from 'react';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.auth.AuthFooter")
 export default class AuthFooter extends React.Component {
     render() {
         return (
diff --git a/src/components/views/auth/AuthHeader.js b/src/components/views/auth/AuthHeader.js
index 57499e397c..323299b3a8 100644
--- a/src/components/views/auth/AuthHeader.js
+++ b/src/components/views/auth/AuthHeader.js
@@ -18,7 +18,9 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import * as sdk from '../../../index';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.auth.AuthHeader")
 export default class AuthHeader extends React.Component {
     static propTypes = {
         disableLanguageSelector: PropTypes.bool,
diff --git a/src/components/views/auth/AuthHeaderLogo.js b/src/components/views/auth/AuthHeaderLogo.js
index 9edf149a83..ea649893c6 100644
--- a/src/components/views/auth/AuthHeaderLogo.js
+++ b/src/components/views/auth/AuthHeaderLogo.js
@@ -17,7 +17,9 @@ limitations under the License.
 'use strict';
 
 import React from 'react';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.auth.AuthHeaderLogo")
 export default class AuthHeaderLogo extends React.PureComponent {
     render() {
         return <div className="mx_AuthHeaderLogo">
diff --git a/src/components/views/auth/CaptchaForm.js b/src/components/views/auth/CaptchaForm.js
index e2d7d594fa..50de24d403 100644
--- a/src/components/views/auth/CaptchaForm.js
+++ b/src/components/views/auth/CaptchaForm.js
@@ -18,12 +18,14 @@ import React, {createRef} from 'react';
 import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
 import CountlyAnalytics from "../../../CountlyAnalytics";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 const DIV_ID = 'mx_recaptcha';
 
 /**
  * A pure UI component which displays a captcha form.
  */
+@replaceableComponent("views.auth.CaptchaForm")
 export default class CaptchaForm extends React.Component {
     static propTypes = {
         sitePublicKey: PropTypes.string,
diff --git a/src/components/views/auth/CompleteSecurityBody.js b/src/components/views/auth/CompleteSecurityBody.js
index d757de9fe0..91cd66f150 100644
--- a/src/components/views/auth/CompleteSecurityBody.js
+++ b/src/components/views/auth/CompleteSecurityBody.js
@@ -17,7 +17,9 @@ limitations under the License.
 'use strict';
 
 import React from 'react';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.auth.CompleteSecurityBody")
 export default class CompleteSecurityBody extends React.PureComponent {
     render() {
         return <div className="mx_CompleteSecurityBody">
diff --git a/src/components/views/auth/CountryDropdown.js b/src/components/views/auth/CountryDropdown.js
index 3296b574a4..e21f112865 100644
--- a/src/components/views/auth/CountryDropdown.js
+++ b/src/components/views/auth/CountryDropdown.js
@@ -22,6 +22,7 @@ import * as sdk from '../../../index';
 import {COUNTRIES, getEmojiFlag} from '../../../phonenumber';
 import SdkConfig from "../../../SdkConfig";
 import { _t } from "../../../languageHandler";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 const COUNTRIES_BY_ISO2 = {};
 for (const c of COUNTRIES) {
@@ -40,6 +41,7 @@ function countryMatchesSearchQuery(query, country) {
     return false;
 }
 
+@replaceableComponent("views.auth.CountryDropdown")
 export default class CountryDropdown extends React.Component {
     constructor(props) {
         super(props);
diff --git a/src/components/views/auth/InteractiveAuthEntryComponents.js b/src/components/views/auth/InteractiveAuthEntryComponents.js
index 7dc1976641..6cbecd22ee 100644
--- a/src/components/views/auth/InteractiveAuthEntryComponents.js
+++ b/src/components/views/auth/InteractiveAuthEntryComponents.js
@@ -26,6 +26,7 @@ import SettingsStore from "../../../settings/SettingsStore";
 import AccessibleButton from "../elements/AccessibleButton";
 import Spinner from "../elements/Spinner";
 import CountlyAnalytics from "../../../CountlyAnalytics";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 /* This file contains a collection of components which are used by the
  * InteractiveAuth to prompt the user to enter the information needed
@@ -75,6 +76,7 @@ import CountlyAnalytics from "../../../CountlyAnalytics";
 
 export const DEFAULT_PHASE = 0;
 
+@replaceableComponent("views.auth.PasswordAuthEntry")
 export class PasswordAuthEntry extends React.Component {
     static LOGIN_TYPE = "m.login.password";
 
@@ -173,6 +175,7 @@ export class PasswordAuthEntry extends React.Component {
     }
 }
 
+@replaceableComponent("views.auth.RecaptchaAuthEntry")
 export class RecaptchaAuthEntry extends React.Component {
     static LOGIN_TYPE = "m.login.recaptcha";
 
@@ -235,6 +238,7 @@ export class RecaptchaAuthEntry extends React.Component {
     }
 }
 
+@replaceableComponent("views.auth.TermsAuthEntry")
 export class TermsAuthEntry extends React.Component {
     static LOGIN_TYPE = "m.login.terms";
 
@@ -385,6 +389,7 @@ export class TermsAuthEntry extends React.Component {
     }
 }
 
+@replaceableComponent("views.auth.EmailIdentityAuthEntry")
 export class EmailIdentityAuthEntry extends React.Component {
     static LOGIN_TYPE = "m.login.email.identity";
 
@@ -432,6 +437,7 @@ export class EmailIdentityAuthEntry extends React.Component {
     }
 }
 
+@replaceableComponent("views.auth.MsisdnAuthEntry")
 export class MsisdnAuthEntry extends React.Component {
     static LOGIN_TYPE = "m.login.msisdn";
 
@@ -578,6 +584,7 @@ export class MsisdnAuthEntry extends React.Component {
     }
 }
 
+@replaceableComponent("views.auth.SSOAuthEntry")
 export class SSOAuthEntry extends React.Component {
     static propTypes = {
         matrixClient: PropTypes.object.isRequired,
@@ -708,6 +715,7 @@ export class SSOAuthEntry extends React.Component {
     }
 }
 
+@replaceableComponent("views.auth.FallbackAuthEntry")
 export class FallbackAuthEntry extends React.Component {
     static propTypes = {
         matrixClient: PropTypes.object.isRequired,
diff --git a/src/components/views/auth/PassphraseField.tsx b/src/components/views/auth/PassphraseField.tsx
index e240ad61ca..274c244b2a 100644
--- a/src/components/views/auth/PassphraseField.tsx
+++ b/src/components/views/auth/PassphraseField.tsx
@@ -22,6 +22,7 @@ import SdkConfig from "../../../SdkConfig";
 import withValidation, {IFieldState, IValidationResult} from "../elements/Validation";
 import {_t, _td} from "../../../languageHandler";
 import Field, {IInputProps} from "../elements/Field";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 interface IProps extends Omit<IInputProps, "onValidate"> {
     autoFocus?: boolean;
@@ -40,6 +41,7 @@ interface IProps extends Omit<IInputProps, "onValidate"> {
     onValidate(result: IValidationResult);
 }
 
+@replaceableComponent("views.auth.PassphraseField")
 class PassphraseField extends PureComponent<IProps> {
     static defaultProps = {
         label: _td("Password"),
diff --git a/src/components/views/auth/PasswordLogin.tsx b/src/components/views/auth/PasswordLogin.tsx
index b2a3d62f55..2a42804a61 100644
--- a/src/components/views/auth/PasswordLogin.tsx
+++ b/src/components/views/auth/PasswordLogin.tsx
@@ -26,6 +26,7 @@ import withValidation from "../elements/Validation";
 import * as Email from "../../../email";
 import Field from "../elements/Field";
 import CountryDropdown from "./CountryDropdown";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 // For validating phone numbers without country codes
 const PHONE_NUMBER_REGEX = /^[0-9()\-\s]*$/;
@@ -66,6 +67,7 @@ enum LoginField {
  * A pure UI component which displays a username/password form.
  * The email/username/phone fields are fully-controlled, the password field is not.
  */
+@replaceableComponent("views.auth.PasswordLogin")
 export default class PasswordLogin extends React.PureComponent<IProps, IState> {
     static defaultProps = {
         onUsernameChanged: function() {},
diff --git a/src/components/views/auth/RegistrationForm.tsx b/src/components/views/auth/RegistrationForm.tsx
index e42ed88f99..85e0933be9 100644
--- a/src/components/views/auth/RegistrationForm.tsx
+++ b/src/components/views/auth/RegistrationForm.tsx
@@ -30,6 +30,7 @@ import PassphraseField from "./PassphraseField";
 import CountlyAnalytics from "../../../CountlyAnalytics";
 import Field from '../elements/Field';
 import RegistrationEmailPromptDialog from '../dialogs/RegistrationEmailPromptDialog';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 enum RegistrationField {
     Email = "field_email",
@@ -80,6 +81,7 @@ interface IState {
 /*
  * A pure UI component which displays a registration form.
  */
+@replaceableComponent("views.auth.RegistrationForm")
 export default class RegistrationForm extends React.PureComponent<IProps, IState> {
     static defaultProps = {
         onValidationChange: console.error,
diff --git a/src/components/views/auth/Welcome.js b/src/components/views/auth/Welcome.js
index 0205f4e0b9..fca66fcf9b 100644
--- a/src/components/views/auth/Welcome.js
+++ b/src/components/views/auth/Welcome.js
@@ -24,10 +24,12 @@ import {_td} from "../../../languageHandler";
 import SettingsStore from "../../../settings/SettingsStore";
 import {UIFeature} from "../../../settings/UIFeature";
 import CountlyAnalytics from "../../../CountlyAnalytics";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 // translatable strings for Welcome pages
 _td("Sign in with SSO");
 
+@replaceableComponent("views.auth.Welcome")
 export default class Welcome extends React.PureComponent {
     constructor(props) {
         super(props);
diff --git a/src/components/views/avatars/DecoratedRoomAvatar.tsx b/src/components/views/avatars/DecoratedRoomAvatar.tsx
index d7e012467b..e95022687a 100644
--- a/src/components/views/avatars/DecoratedRoomAvatar.tsx
+++ b/src/components/views/avatars/DecoratedRoomAvatar.tsx
@@ -30,6 +30,7 @@ import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import {_t} from "../../../languageHandler";
 import TextWithTooltip from "../elements/TextWithTooltip";
 import DMRoomMap from "../../../utils/DMRoomMap";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 interface IProps {
     room: Room;
@@ -68,6 +69,7 @@ function tooltipText(variant: Icon) {
     }
 }
 
+@replaceableComponent("views.avatars.DecoratedRoomAvatar")
 export default class DecoratedRoomAvatar extends React.PureComponent<IProps, IState> {
     private _dmUser: User;
     private isUnmounted = false;
diff --git a/src/components/views/avatars/GroupAvatar.tsx b/src/components/views/avatars/GroupAvatar.tsx
index 51327605c0..a033257871 100644
--- a/src/components/views/avatars/GroupAvatar.tsx
+++ b/src/components/views/avatars/GroupAvatar.tsx
@@ -17,6 +17,7 @@ limitations under the License.
 import React from 'react';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import BaseAvatar from './BaseAvatar';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 export interface IProps {
         groupId?: string;
@@ -28,6 +29,7 @@ export interface IProps {
         onClick?: React.MouseEventHandler;
 }
 
+@replaceableComponent("views.avatars.GroupAvatar")
 export default class GroupAvatar extends React.Component<IProps> {
     public static defaultProps = {
         width: 36,
diff --git a/src/components/views/avatars/MemberAvatar.tsx b/src/components/views/avatars/MemberAvatar.tsx
index 60b043016b..641046aa55 100644
--- a/src/components/views/avatars/MemberAvatar.tsx
+++ b/src/components/views/avatars/MemberAvatar.tsx
@@ -22,6 +22,7 @@ import dis from "../../../dispatcher/dispatcher";
 import {Action} from "../../../dispatcher/actions";
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import BaseAvatar from "./BaseAvatar";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 interface IProps extends Omit<React.ComponentProps<typeof BaseAvatar>, "name" | "idName" | "url"> {
     member: RoomMember;
@@ -42,6 +43,7 @@ interface IState {
     imageUrl?: string;
 }
 
+@replaceableComponent("views.avatars.MemberAvatar")
 export default class MemberAvatar extends React.Component<IProps, IState> {
     public static defaultProps = {
         width: 40,
diff --git a/src/components/views/avatars/MemberStatusMessageAvatar.js b/src/components/views/avatars/MemberStatusMessageAvatar.js
index d5d927106c..acf190f17f 100644
--- a/src/components/views/avatars/MemberStatusMessageAvatar.js
+++ b/src/components/views/avatars/MemberStatusMessageAvatar.js
@@ -23,7 +23,9 @@ import classNames from 'classnames';
 import StatusMessageContextMenu from "../context_menus/StatusMessageContextMenu";
 import SettingsStore from "../../../settings/SettingsStore";
 import {ContextMenu, ContextMenuButton} from "../../structures/ContextMenu";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.avatars.MemberStatusMessageAvatar")
 export default class MemberStatusMessageAvatar extends React.Component {
     static propTypes = {
         member: PropTypes.object.isRequired,
diff --git a/src/components/views/avatars/RoomAvatar.tsx b/src/components/views/avatars/RoomAvatar.tsx
index 952b9d4cb6..0a59f6e36a 100644
--- a/src/components/views/avatars/RoomAvatar.tsx
+++ b/src/components/views/avatars/RoomAvatar.tsx
@@ -23,6 +23,7 @@ import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import Modal from '../../../Modal';
 import * as Avatar from '../../../Avatar';
 import {ResizeMethod} from "../../../Avatar";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 interface IProps extends Omit<ComponentProps<typeof BaseAvatar>, "name" | "idName" | "url" | "onClick"> {
     // Room may be left unset here, but if it is,
@@ -42,6 +43,7 @@ interface IState {
     urls: string[];
 }
 
+@replaceableComponent("views.avatars.RoomAvatar")
 export default class RoomAvatar extends React.Component<IProps, IState> {
     public static defaultProps = {
         width: 36,
diff --git a/src/components/views/context_menus/CallContextMenu.tsx b/src/components/views/context_menus/CallContextMenu.tsx
index 3557976326..97473059a6 100644
--- a/src/components/views/context_menus/CallContextMenu.tsx
+++ b/src/components/views/context_menus/CallContextMenu.tsx
@@ -22,11 +22,13 @@ import { MatrixCall } from 'matrix-js-sdk/src/webrtc/call';
 import CallHandler from '../../../CallHandler';
 import InviteDialog, { KIND_CALL_TRANSFER } from '../dialogs/InviteDialog';
 import Modal from '../../../Modal';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 interface IProps extends IContextMenuProps {
     call: MatrixCall;
 }
 
+@replaceableComponent("views.context_menus.CallContextMenu")
 export default class CallContextMenu extends React.Component<IProps> {
     static propTypes = {
         // js-sdk User object. Not required because it might not exist.
diff --git a/src/components/views/context_menus/DialpadContextMenu.tsx b/src/components/views/context_menus/DialpadContextMenu.tsx
index e3aed0179b..17abce0c61 100644
--- a/src/components/views/context_menus/DialpadContextMenu.tsx
+++ b/src/components/views/context_menus/DialpadContextMenu.tsx
@@ -19,6 +19,7 @@ import { _t } from '../../../languageHandler';
 import { ContextMenu, IProps as IContextMenuProps } from '../../structures/ContextMenu';
 import { MatrixCall } from 'matrix-js-sdk/src/webrtc/call';
 import Dialpad from '../voip/DialPad';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 interface IProps extends IContextMenuProps {
     call: MatrixCall;
@@ -28,6 +29,7 @@ interface IState {
     value: string;
 }
 
+@replaceableComponent("views.context_menus.DialpadContextMenu")
 export default class DialpadContextMenu extends React.Component<IProps, IState> {
     constructor(props) {
         super(props);
diff --git a/src/components/views/context_menus/GenericElementContextMenu.js b/src/components/views/context_menus/GenericElementContextMenu.js
index cea684b663..e04e3f7695 100644
--- a/src/components/views/context_menus/GenericElementContextMenu.js
+++ b/src/components/views/context_menus/GenericElementContextMenu.js
@@ -16,6 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 /*
  * This component can be used to display generic HTML content in a contextual
@@ -23,6 +24,7 @@ import PropTypes from 'prop-types';
  */
 
 
+@replaceableComponent("views.context_menus.GenericElementContextMenu")
 export default class GenericElementContextMenu extends React.Component {
     static propTypes = {
         element: PropTypes.element.isRequired,
diff --git a/src/components/views/context_menus/GenericTextContextMenu.js b/src/components/views/context_menus/GenericTextContextMenu.js
index 068f83be5f..3d3add006f 100644
--- a/src/components/views/context_menus/GenericTextContextMenu.js
+++ b/src/components/views/context_menus/GenericTextContextMenu.js
@@ -16,7 +16,9 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.context_menus.GenericTextContextMenu")
 export default class GenericTextContextMenu extends React.Component {
     static propTypes = {
         message: PropTypes.string.isRequired,
diff --git a/src/components/views/context_menus/GroupInviteTileContextMenu.js b/src/components/views/context_menus/GroupInviteTileContextMenu.js
index 27ef76452f..11a9d90ac2 100644
--- a/src/components/views/context_menus/GroupInviteTileContextMenu.js
+++ b/src/components/views/context_menus/GroupInviteTileContextMenu.js
@@ -23,7 +23,9 @@ import Modal from '../../../Modal';
 import {Group} from 'matrix-js-sdk';
 import GroupStore from "../../../stores/GroupStore";
 import {MenuItem} from "../../structures/ContextMenu";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.context_menus.GroupInviteTileContextMenu")
 export default class GroupInviteTileContextMenu extends React.Component {
     static propTypes = {
         group: PropTypes.instanceOf(Group).isRequired,
diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js
index 6b871e4f24..e19cfab809 100644
--- a/src/components/views/context_menus/MessageContextMenu.js
+++ b/src/components/views/context_menus/MessageContextMenu.js
@@ -32,11 +32,13 @@ import { isUrlPermitted } from '../../../HtmlUtils';
 import { isContentActionable } from '../../../utils/EventUtils';
 import {MenuItem} from "../../structures/ContextMenu";
 import {EventType} from "matrix-js-sdk/src/@types/event";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 function canCancel(eventStatus) {
     return eventStatus === EventStatus.QUEUED || eventStatus === EventStatus.NOT_SENT;
 }
 
+@replaceableComponent("views.context_menus.MessageContextMenu")
 export default class MessageContextMenu extends React.Component {
     static propTypes = {
         /* the MatrixEvent associated with the context menu */
diff --git a/src/components/views/context_menus/StatusMessageContextMenu.js b/src/components/views/context_menus/StatusMessageContextMenu.js
index 5e6f06dd5d..41f0e0ba61 100644
--- a/src/components/views/context_menus/StatusMessageContextMenu.js
+++ b/src/components/views/context_menus/StatusMessageContextMenu.js
@@ -20,7 +20,9 @@ import { _t } from '../../../languageHandler';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import * as sdk from '../../../index';
 import AccessibleButton from '../elements/AccessibleButton';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.context_menus.StatusMessageContextMenu")
 export default class StatusMessageContextMenu extends React.Component {
     static propTypes = {
         // js-sdk User object. Not required because it might not exist.
diff --git a/src/components/views/context_menus/TagTileContextMenu.js b/src/components/views/context_menus/TagTileContextMenu.js
index 8d690483a8..8dea62690c 100644
--- a/src/components/views/context_menus/TagTileContextMenu.js
+++ b/src/components/views/context_menus/TagTileContextMenu.js
@@ -22,7 +22,9 @@ import dis from '../../../dispatcher/dispatcher';
 import TagOrderActions from '../../../actions/TagOrderActions';
 import {MenuItem} from "../../structures/ContextMenu";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.context_menus.TagTileContextMenu")
 export default class TagTileContextMenu extends React.Component {
     static propTypes = {
         tag: PropTypes.string.isRequired,
diff --git a/src/components/views/dialogs/AddressPickerDialog.js b/src/components/views/dialogs/AddressPickerDialog.js
index 2cd09874b2..929d688e47 100644
--- a/src/components/views/dialogs/AddressPickerDialog.js
+++ b/src/components/views/dialogs/AddressPickerDialog.js
@@ -33,6 +33,7 @@ import { abbreviateUrl } from '../../../utils/UrlUtils';
 import {sleep} from "../../../utils/promise";
 import {Key} from "../../../Keyboard";
 import {Action} from "../../../dispatcher/actions";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 const TRUNCATE_QUERY_LIST = 40;
 const QUERY_USER_DIRECTORY_DEBOUNCE_MS = 200;
@@ -43,7 +44,7 @@ const addressTypeName = {
     'email': _td("email address"),
 };
 
-
+@replaceableComponent("views.dialogs.AddressPickerDialog")
 export default class AddressPickerDialog extends React.Component {
     static propTypes = {
         title: PropTypes.string.isRequired,
diff --git a/src/components/views/dialogs/AskInviteAnywayDialog.js b/src/components/views/dialogs/AskInviteAnywayDialog.js
index c69400977a..e6cd45ba6b 100644
--- a/src/components/views/dialogs/AskInviteAnywayDialog.js
+++ b/src/components/views/dialogs/AskInviteAnywayDialog.js
@@ -20,7 +20,9 @@ import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import SettingsStore from "../../../settings/SettingsStore";
 import {SettingLevel} from "../../../settings/SettingLevel";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.dialogs.AskInviteAnywayDialog")
 export default class AskInviteAnywayDialog extends React.Component {
     static propTypes = {
         unknownProfileUsers: PropTypes.array.isRequired, // [ {userId, errorText}... ]
diff --git a/src/components/views/dialogs/BaseDialog.js b/src/components/views/dialogs/BaseDialog.js
index 9ba5368ee5..0858e53e50 100644
--- a/src/components/views/dialogs/BaseDialog.js
+++ b/src/components/views/dialogs/BaseDialog.js
@@ -26,6 +26,7 @@ import AccessibleButton from '../elements/AccessibleButton';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import { _t } from "../../../languageHandler";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 /*
  * Basic container for modal dialogs.
@@ -33,6 +34,7 @@ import MatrixClientContext from "../../../contexts/MatrixClientContext";
  * Includes a div for the title, and a keypress handler which cancels the
  * dialog on escape.
  */
+@replaceableComponent("views.dialogs.BaseDialog")
 export default class BaseDialog extends React.Component {
     static propTypes = {
         // onFinished callback to call when Escape is pressed
diff --git a/src/components/views/dialogs/BugReportDialog.js b/src/components/views/dialogs/BugReportDialog.js
index c4dd0a1430..8948c14c7c 100644
--- a/src/components/views/dialogs/BugReportDialog.js
+++ b/src/components/views/dialogs/BugReportDialog.js
@@ -25,7 +25,9 @@ import Modal from '../../../Modal';
 import { _t } from '../../../languageHandler';
 import sendBugReport, {downloadBugReport} from '../../../rageshake/submit-rageshake';
 import AccessibleButton from "../elements/AccessibleButton";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.dialogs.BugReportDialog")
 export default class BugReportDialog extends React.Component {
     constructor(props) {
         super(props);
diff --git a/src/components/views/dialogs/CommunityPrototypeInviteDialog.tsx b/src/components/views/dialogs/CommunityPrototypeInviteDialog.tsx
index 1c8a4ad6f6..d1080566ac 100644
--- a/src/components/views/dialogs/CommunityPrototypeInviteDialog.tsx
+++ b/src/components/views/dialogs/CommunityPrototypeInviteDialog.tsx
@@ -31,6 +31,7 @@ import {inviteMultipleToRoom, showAnyInviteErrors} from "../../../RoomInvite";
 import StyledCheckbox from "../elements/StyledCheckbox";
 import Modal from "../../../Modal";
 import ErrorDialog from "./ErrorDialog";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 interface IProps extends IDialogProps {
     roomId: string;
@@ -52,6 +53,7 @@ interface IState {
     busy: boolean;
 }
 
+@replaceableComponent("views.dialogs.CommunityPrototypeInviteDialog")
 export default class CommunityPrototypeInviteDialog extends React.PureComponent<IProps, IState> {
     constructor(props: IProps) {
         super(props);
diff --git a/src/components/views/dialogs/ConfirmAndWaitRedactDialog.js b/src/components/views/dialogs/ConfirmAndWaitRedactDialog.js
index 0622dd7dfb..37d5510756 100644
--- a/src/components/views/dialogs/ConfirmAndWaitRedactDialog.js
+++ b/src/components/views/dialogs/ConfirmAndWaitRedactDialog.js
@@ -17,6 +17,7 @@ limitations under the License.
 import React from 'react';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 /*
  * A dialog for confirming a redaction.
@@ -30,6 +31,7 @@ import { _t } from '../../../languageHandler';
  *
  * To avoid this, we keep the dialog open as long as /redact is in progress.
  */
+@replaceableComponent("views.dialogs.ConfirmAndWaitRedactDialog")
 export default class ConfirmAndWaitRedactDialog extends React.PureComponent {
     constructor(props) {
         super(props);
diff --git a/src/components/views/dialogs/ConfirmRedactDialog.js b/src/components/views/dialogs/ConfirmRedactDialog.js
index 2216f9a93a..bd63d3acc1 100644
--- a/src/components/views/dialogs/ConfirmRedactDialog.js
+++ b/src/components/views/dialogs/ConfirmRedactDialog.js
@@ -17,10 +17,12 @@ limitations under the License.
 import React from 'react';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 /*
  * A dialog for confirming a redaction.
  */
+@replaceableComponent("views.dialogs.ConfirmRedactDialog")
 export default class ConfirmRedactDialog extends React.Component {
     render() {
         const TextInputDialog = sdk.getComponent('views.dialogs.TextInputDialog');
diff --git a/src/components/views/dialogs/ConfirmUserActionDialog.js b/src/components/views/dialogs/ConfirmUserActionDialog.js
index 44f57f047e..8827f161f1 100644
--- a/src/components/views/dialogs/ConfirmUserActionDialog.js
+++ b/src/components/views/dialogs/ConfirmUserActionDialog.js
@@ -20,6 +20,7 @@ import { MatrixClient } from 'matrix-js-sdk';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import { GroupMemberType } from '../../../groups';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 /*
  * A dialog for confirming an operation on another user.
@@ -29,6 +30,7 @@ import { GroupMemberType } from '../../../groups';
  * to make it obvious what is going to happen.
  * Also tweaks the style for 'dangerous' actions (albeit only with colour)
  */
+@replaceableComponent("views.dialogs.ConfirmUserActionDialog")
 export default class ConfirmUserActionDialog extends React.Component {
     static propTypes = {
         // matrix-js-sdk (room) member object. Supply either this or 'groupMember'
diff --git a/src/components/views/dialogs/security/ConfirmDestroyCrossSigningDialog.js b/src/components/views/dialogs/security/ConfirmDestroyCrossSigningDialog.js
index abc1586205..43fb25f152 100644
--- a/src/components/views/dialogs/security/ConfirmDestroyCrossSigningDialog.js
+++ b/src/components/views/dialogs/security/ConfirmDestroyCrossSigningDialog.js
@@ -18,7 +18,9 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import {_t} from "../../../../languageHandler";
 import * as sdk from "../../../../index";
+import {replaceableComponent} from "../../../../utils/replaceableComponent";
 
+@replaceableComponent("views.dialogs.security.ConfirmDestroyCrossSigningDialog")
 export default class ConfirmDestroyCrossSigningDialog extends React.Component {
     static propTypes = {
         onFinished: PropTypes.func.isRequired,
diff --git a/src/components/views/dialogs/security/CreateCrossSigningDialog.js b/src/components/views/dialogs/security/CreateCrossSigningDialog.js
index be546d2616..fedcc02f89 100644
--- a/src/components/views/dialogs/security/CreateCrossSigningDialog.js
+++ b/src/components/views/dialogs/security/CreateCrossSigningDialog.js
@@ -25,12 +25,14 @@ import DialogButtons from '../../elements/DialogButtons';
 import BaseDialog from '../BaseDialog';
 import Spinner from '../../elements/Spinner';
 import InteractiveAuthDialog from '../InteractiveAuthDialog';
+import {replaceableComponent} from "../../../../utils/replaceableComponent";
 
 /*
  * Walks the user through the process of creating a cross-signing keys. In most
  * cases, only a spinner is shown, but for more complex auth like SSO, the user
  * may need to complete some steps to proceed.
  */
+@replaceableComponent("views.dialogs.security.CreateCrossSigningDialog")
 export default class CreateCrossSigningDialog extends React.PureComponent {
     static propTypes = {
         accountPassword: PropTypes.string,
diff --git a/src/components/views/dialogs/security/SetupEncryptionDialog.js b/src/components/views/dialogs/security/SetupEncryptionDialog.js
index 9ce3144534..3c15ea9f1d 100644
--- a/src/components/views/dialogs/security/SetupEncryptionDialog.js
+++ b/src/components/views/dialogs/security/SetupEncryptionDialog.js
@@ -20,6 +20,7 @@ import SetupEncryptionBody from '../../../structures/auth/SetupEncryptionBody';
 import BaseDialog from '../BaseDialog';
 import { _t } from '../../../../languageHandler';
 import { SetupEncryptionStore, PHASE_DONE } from '../../../../stores/SetupEncryptionStore';
+import {replaceableComponent} from "../../../../utils/replaceableComponent";
 
 function iconFromPhase(phase) {
     if (phase === PHASE_DONE) {
@@ -29,6 +30,7 @@ function iconFromPhase(phase) {
     }
 }
 
+@replaceableComponent("views.dialogs.security.SetupEncryptionDialog")
 export default class SetupEncryptionDialog extends React.Component {
     static propTypes = {
         onFinished: PropTypes.func.isRequired,

From c359dff73879ca231a7bbc970ff532a6973ef293 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 8 Mar 2021 19:59:41 -0700
Subject: [PATCH 222/420] Batch of views getting replaceableComponent
 decorators

---
 src/components/views/dialogs/ConfirmWipeDeviceDialog.js        | 2 ++
 .../views/dialogs/CreateCommunityPrototypeDialog.tsx           | 2 ++
 src/components/views/dialogs/CreateGroupDialog.js              | 2 ++
 src/components/views/dialogs/CreateRoomDialog.js               | 2 ++
 src/components/views/dialogs/DeactivateAccountDialog.js        | 2 ++
 src/components/views/dialogs/DevtoolsDialog.js                 | 2 ++
 src/components/views/dialogs/EditCommunityPrototypeDialog.tsx  | 2 ++
 src/components/views/dialogs/ErrorDialog.js                    | 2 ++
 src/components/views/dialogs/HostSignupDialog.tsx              | 2 ++
 src/components/views/dialogs/IncomingSasDialog.js              | 2 ++
 src/components/views/dialogs/IntegrationsDisabledDialog.js     | 2 ++
 src/components/views/dialogs/IntegrationsImpossibleDialog.js   | 2 ++
 src/components/views/dialogs/InteractiveAuthDialog.js          | 2 ++
 src/components/views/dialogs/InviteDialog.tsx                  | 2 ++
 src/components/views/dialogs/LogoutDialog.js                   | 2 ++
 .../views/dialogs/ManualDeviceKeyVerificationDialog.js         | 2 ++
 src/components/views/dialogs/MessageEditHistoryDialog.js       | 2 ++
 src/components/views/dialogs/ModalWidgetDialog.tsx             | 2 ++
 src/components/views/dialogs/ReportEventDialog.js              | 2 ++
 src/components/views/dialogs/RoomSettingsDialog.js             | 2 ++
 src/components/views/dialogs/RoomUpgradeDialog.js              | 2 ++
 src/components/views/dialogs/RoomUpgradeWarningDialog.js       | 2 ++
 src/components/views/dialogs/ServerOfflineDialog.tsx           | 2 ++
 src/components/views/dialogs/ServerPickerDialog.tsx            | 2 ++
 src/components/views/dialogs/SessionRestoreErrorDialog.js      | 3 ++-
 src/components/views/dialogs/SetEmailDialog.js                 | 2 ++
 src/components/views/dialogs/ShareDialog.tsx                   | 2 ++
 src/components/views/dialogs/StorageEvictedDialog.js           | 2 ++
 src/components/views/dialogs/TabbedIntegrationManagerDialog.js | 2 ++
 src/components/views/dialogs/TermsDialog.js                    | 2 ++
 src/components/views/dialogs/TextInputDialog.js                | 2 ++
 src/components/views/dialogs/UploadConfirmDialog.js            | 2 ++
 src/components/views/dialogs/UploadFailureDialog.js            | 2 ++
 src/components/views/dialogs/UserSettingsDialog.js             | 2 ++
 src/components/views/dialogs/VerificationRequestDialog.js      | 2 ++
 .../views/dialogs/WidgetCapabilitiesPromptDialog.tsx           | 2 ++
 src/components/views/dialogs/WidgetOpenIDPermissionsDialog.js  | 2 ++
 src/components/views/elements/AccessibleTooltipButton.tsx      | 2 ++
 src/components/views/elements/ActionButton.js                  | 2 ++
 src/components/views/elements/AddressSelector.js               | 2 ++
 src/components/views/elements/AddressTile.js                   | 3 ++-
 src/components/views/elements/AppPermission.js                 | 2 ++
 src/components/views/elements/AppTile.js                       | 2 ++
 src/components/views/elements/DesktopCapturerSourcePicker.tsx  | 2 ++
 src/components/views/elements/DialogButtons.js                 | 2 ++
 src/components/views/elements/DirectorySearchBox.js            | 2 ++
 src/components/views/elements/Draggable.tsx                    | 2 ++
 src/components/views/elements/Dropdown.js                      | 2 ++
 src/components/views/elements/EditableItemList.js              | 2 ++
 src/components/views/elements/EditableText.js                  | 2 ++
 src/components/views/elements/EditableTextContainer.js         | 2 ++
 src/components/views/elements/ErrorBoundary.js                 | 2 ++
 src/components/views/elements/EventTilePreview.tsx             | 2 ++
 src/components/views/elements/Flair.js                         | 2 ++
 src/components/views/elements/IRCTimelineProfileResizer.tsx    | 2 ++
 src/components/views/elements/ImageView.js                     | 2 ++
 src/components/views/elements/InfoTooltip.tsx                  | 2 ++
 src/components/views/elements/InlineSpinner.js                 | 2 ++
 src/components/views/elements/LabelledToggleSwitch.js          | 2 ++
 src/components/views/elements/LanguageDropdown.js              | 2 ++
 src/components/views/elements/LazyRenderList.js                | 2 ++
 src/components/views/elements/MemberEventListSummary.tsx       | 2 ++
 src/components/views/elements/PersistedElement.js              | 2 ++
 src/components/views/elements/PersistentApp.js                 | 2 ++
 src/components/views/elements/Pill.js                          | 2 ++
 src/components/views/elements/PowerSelector.js                 | 2 ++
 src/components/views/elements/ReplyThread.js                   | 2 ++
 src/components/views/elements/RoomAliasField.js                | 2 ++
 src/components/views/elements/SettingsFlag.tsx                 | 2 ++
 src/components/views/elements/Slider.tsx                       | 2 ++
 src/components/views/elements/SpellCheckLanguagesDropdown.tsx  | 2 ++
 src/components/views/elements/Spoiler.js                       | 2 ++
 src/components/views/elements/StyledCheckbox.tsx               | 2 ++
 src/components/views/elements/StyledRadioButton.tsx            | 2 ++
 src/components/views/elements/SyntaxHighlight.js               | 2 ++
 src/components/views/elements/TagTile.js                       | 2 ++
 src/components/views/elements/TextWithTooltip.js               | 2 ++
 src/components/views/elements/TintableSvg.js                   | 2 ++
 src/components/views/elements/Tooltip.tsx                      | 2 ++
 src/components/views/elements/TooltipButton.js                 | 2 ++
 src/components/views/elements/TruncatedList.js                 | 2 ++
 src/components/views/elements/UserTagTile.tsx                  | 2 ++
 82 files changed, 164 insertions(+), 2 deletions(-)

diff --git a/src/components/views/dialogs/ConfirmWipeDeviceDialog.js b/src/components/views/dialogs/ConfirmWipeDeviceDialog.js
index 41ef9131fa..4faaad0f7e 100644
--- a/src/components/views/dialogs/ConfirmWipeDeviceDialog.js
+++ b/src/components/views/dialogs/ConfirmWipeDeviceDialog.js
@@ -18,7 +18,9 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import {_t} from "../../../languageHandler";
 import * as sdk from "../../../index";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.dialogs.ConfirmWipeDeviceDialog")
 export default class ConfirmWipeDeviceDialog extends React.Component {
     static propTypes = {
         onFinished: PropTypes.func.isRequired,
diff --git a/src/components/views/dialogs/CreateCommunityPrototypeDialog.tsx b/src/components/views/dialogs/CreateCommunityPrototypeDialog.tsx
index 1d9d92b9c9..9b4484d661 100644
--- a/src/components/views/dialogs/CreateCommunityPrototypeDialog.tsx
+++ b/src/components/views/dialogs/CreateCommunityPrototypeDialog.tsx
@@ -25,6 +25,7 @@ import InfoTooltip from "../elements/InfoTooltip";
 import dis from "../../../dispatcher/dispatcher";
 import {showCommunityRoomInviteDialog} from "../../../RoomInvite";
 import GroupStore from "../../../stores/GroupStore";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 interface IProps extends IDialogProps {
 }
@@ -38,6 +39,7 @@ interface IState {
     avatarPreview: string;
 }
 
+@replaceableComponent("views.dialogs.CreateCommunityPrototypeDialog")
 export default class CreateCommunityPrototypeDialog extends React.PureComponent<IProps, IState> {
     private avatarUploadRef: React.RefObject<HTMLInputElement> = React.createRef();
 
diff --git a/src/components/views/dialogs/CreateGroupDialog.js b/src/components/views/dialogs/CreateGroupDialog.js
index 6636153c98..e6c7a67aca 100644
--- a/src/components/views/dialogs/CreateGroupDialog.js
+++ b/src/components/views/dialogs/CreateGroupDialog.js
@@ -20,7 +20,9 @@ import * as sdk from '../../../index';
 import dis from '../../../dispatcher/dispatcher';
 import { _t } from '../../../languageHandler';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.dialogs.CreateGroupDialog")
 export default class CreateGroupDialog extends React.Component {
     static propTypes = {
         onFinished: PropTypes.func.isRequired,
diff --git a/src/components/views/dialogs/CreateRoomDialog.js b/src/components/views/dialogs/CreateRoomDialog.js
index 0771b0ec45..e9dc6e2be0 100644
--- a/src/components/views/dialogs/CreateRoomDialog.js
+++ b/src/components/views/dialogs/CreateRoomDialog.js
@@ -27,7 +27,9 @@ import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import {Key} from "../../../Keyboard";
 import {privateShouldBeEncrypted} from "../../../createRoom";
 import {CommunityPrototypeStore} from "../../../stores/CommunityPrototypeStore";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.dialogs.CreateRoomDialog")
 export default class CreateRoomDialog extends React.Component {
     static propTypes = {
         onFinished: PropTypes.func.isRequired,
diff --git a/src/components/views/dialogs/DeactivateAccountDialog.js b/src/components/views/dialogs/DeactivateAccountDialog.js
index fca8c42546..4e52549d51 100644
--- a/src/components/views/dialogs/DeactivateAccountDialog.js
+++ b/src/components/views/dialogs/DeactivateAccountDialog.js
@@ -26,7 +26,9 @@ import { _t } from '../../../languageHandler';
 import InteractiveAuth, {ERROR_USER_CANCELLED} from "../../structures/InteractiveAuth";
 import {DEFAULT_PHASE, PasswordAuthEntry, SSOAuthEntry} from "../auth/InteractiveAuthEntryComponents";
 import StyledCheckbox from "../elements/StyledCheckbox";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.dialogs.DeactivateAccountDialog")
 export default class DeactivateAccountDialog extends React.Component {
     constructor(props) {
         super(props);
diff --git a/src/components/views/dialogs/DevtoolsDialog.js b/src/components/views/dialogs/DevtoolsDialog.js
index 814378bb51..9b24aaa571 100644
--- a/src/components/views/dialogs/DevtoolsDialog.js
+++ b/src/components/views/dialogs/DevtoolsDialog.js
@@ -38,6 +38,7 @@ import {SETTINGS} from "../../../settings/Settings";
 import SettingsStore, {LEVEL_ORDER} from "../../../settings/SettingsStore";
 import Modal from "../../../Modal";
 import ErrorDialog from "./ErrorDialog";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 class GenericEditor extends React.PureComponent {
     // static propTypes = {onBack: PropTypes.func.isRequired};
@@ -1089,6 +1090,7 @@ const Entries = [
     SettingsExplorer,
 ];
 
+@replaceableComponent("views.dialogs.DevtoolsDialog")
 export default class DevtoolsDialog extends React.PureComponent {
     static propTypes = {
         roomId: PropTypes.string.isRequired,
diff --git a/src/components/views/dialogs/EditCommunityPrototypeDialog.tsx b/src/components/views/dialogs/EditCommunityPrototypeDialog.tsx
index 3071854b3e..504d563bd9 100644
--- a/src/components/views/dialogs/EditCommunityPrototypeDialog.tsx
+++ b/src/components/views/dialogs/EditCommunityPrototypeDialog.tsx
@@ -23,6 +23,7 @@ import AccessibleButton from "../elements/AccessibleButton";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import { CommunityPrototypeStore } from "../../../stores/CommunityPrototypeStore";
 import FlairStore from "../../../stores/FlairStore";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 interface IProps extends IDialogProps {
     communityId: string;
@@ -38,6 +39,7 @@ interface IState {
 }
 
 // XXX: This is a lot of duplication from the create dialog, just in a different shape
+@replaceableComponent("views.dialogs.EditCommunityPrototypeDialog")
 export default class EditCommunityPrototypeDialog extends React.PureComponent<IProps, IState> {
     private avatarUploadRef: React.RefObject<HTMLInputElement> = React.createRef();
 
diff --git a/src/components/views/dialogs/ErrorDialog.js b/src/components/views/dialogs/ErrorDialog.js
index 3bfa635adf..5197c68b5a 100644
--- a/src/components/views/dialogs/ErrorDialog.js
+++ b/src/components/views/dialogs/ErrorDialog.js
@@ -29,7 +29,9 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.dialogs.ErrorDialog")
 export default class ErrorDialog extends React.Component {
     static propTypes = {
         title: PropTypes.string,
diff --git a/src/components/views/dialogs/HostSignupDialog.tsx b/src/components/views/dialogs/HostSignupDialog.tsx
index 45a03b7cf0..c8bc907136 100644
--- a/src/components/views/dialogs/HostSignupDialog.tsx
+++ b/src/components/views/dialogs/HostSignupDialog.tsx
@@ -31,6 +31,7 @@ import {
     IPostmessageResponseData,
     PostmessageAction,
 } from "./HostSignupDialogTypes";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 const HOST_SIGNUP_KEY = "host_signup";
 
@@ -42,6 +43,7 @@ interface IState {
     minimized: boolean;
 }
 
+@replaceableComponent("views.dialogs.HostSignupDialog")
 export default class HostSignupDialog extends React.PureComponent<IProps, IState> {
     private iframeRef: React.RefObject<HTMLIFrameElement> = React.createRef();
     private readonly config: IHostSignupConfig;
diff --git a/src/components/views/dialogs/IncomingSasDialog.js b/src/components/views/dialogs/IncomingSasDialog.js
index 2a4ff9cec3..d65ec7563f 100644
--- a/src/components/views/dialogs/IncomingSasDialog.js
+++ b/src/components/views/dialogs/IncomingSasDialog.js
@@ -19,6 +19,7 @@ import PropTypes from 'prop-types';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 const PHASE_START = 0;
 const PHASE_SHOW_SAS = 1;
@@ -26,6 +27,7 @@ const PHASE_WAIT_FOR_PARTNER_TO_CONFIRM = 2;
 const PHASE_VERIFIED = 3;
 const PHASE_CANCELLED = 4;
 
+@replaceableComponent("views.dialogs.IncomingSasDialog")
 export default class IncomingSasDialog extends React.Component {
     static propTypes = {
         verifier: PropTypes.object.isRequired,
diff --git a/src/components/views/dialogs/IntegrationsDisabledDialog.js b/src/components/views/dialogs/IntegrationsDisabledDialog.js
index 7c996fbeab..0e9878f4bc 100644
--- a/src/components/views/dialogs/IntegrationsDisabledDialog.js
+++ b/src/components/views/dialogs/IntegrationsDisabledDialog.js
@@ -20,7 +20,9 @@ import {_t} from "../../../languageHandler";
 import * as sdk from "../../../index";
 import dis from '../../../dispatcher/dispatcher';
 import {Action} from "../../../dispatcher/actions";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.dialogs.IntegrationsDisabledDialog")
 export default class IntegrationsDisabledDialog extends React.Component {
     static propTypes = {
         onFinished: PropTypes.func.isRequired,
diff --git a/src/components/views/dialogs/IntegrationsImpossibleDialog.js b/src/components/views/dialogs/IntegrationsImpossibleDialog.js
index 68bedc711d..9bc9d02ba6 100644
--- a/src/components/views/dialogs/IntegrationsImpossibleDialog.js
+++ b/src/components/views/dialogs/IntegrationsImpossibleDialog.js
@@ -19,7 +19,9 @@ import PropTypes from 'prop-types';
 import {_t} from "../../../languageHandler";
 import SdkConfig from "../../../SdkConfig";
 import * as sdk from "../../../index";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.dialogs.IntegrationsImpossibleDialog")
 export default class IntegrationsImpossibleDialog extends React.Component {
     static propTypes = {
         onFinished: PropTypes.func.isRequired,
diff --git a/src/components/views/dialogs/InteractiveAuthDialog.js b/src/components/views/dialogs/InteractiveAuthDialog.js
index 22291225ad..28a9bf673a 100644
--- a/src/components/views/dialogs/InteractiveAuthDialog.js
+++ b/src/components/views/dialogs/InteractiveAuthDialog.js
@@ -25,7 +25,9 @@ import { _t } from '../../../languageHandler';
 import AccessibleButton from '../elements/AccessibleButton';
 import {ERROR_USER_CANCELLED} from "../../structures/InteractiveAuth";
 import {SSOAuthEntry} from "../auth/InteractiveAuthEntryComponents";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.dialogs.InteractiveAuthDialog")
 export default class InteractiveAuthDialog extends React.Component {
     static propTypes = {
         // matrix client to use for UI auth requests
diff --git a/src/components/views/dialogs/InviteDialog.tsx b/src/components/views/dialogs/InviteDialog.tsx
index 9bc5b6476f..db9077291e 100644
--- a/src/components/views/dialogs/InviteDialog.tsx
+++ b/src/components/views/dialogs/InviteDialog.tsx
@@ -42,6 +42,7 @@ import {UIFeature} from "../../../settings/UIFeature";
 import CountlyAnalytics from "../../../CountlyAnalytics";
 import {Room} from "matrix-js-sdk/src/models/room";
 import { MatrixCall } from 'matrix-js-sdk/src/webrtc/call';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 // we have a number of types defined from the Matrix spec which can't reasonably be altered here.
 /* eslint-disable camelcase */
@@ -337,6 +338,7 @@ interface IInviteDialogState {
     errorText: string,
 }
 
+@replaceableComponent("views.dialogs.InviteDialog")
 export default class InviteDialog extends React.PureComponent<IInviteDialogProps, IInviteDialogState> {
     static defaultProps = {
         kind: KIND_DM,
diff --git a/src/components/views/dialogs/LogoutDialog.js b/src/components/views/dialogs/LogoutDialog.js
index af36dba2b6..7bced46d43 100644
--- a/src/components/views/dialogs/LogoutDialog.js
+++ b/src/components/views/dialogs/LogoutDialog.js
@@ -22,7 +22,9 @@ import dis from '../../../dispatcher/dispatcher';
 import { _t } from '../../../languageHandler';
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import RestoreKeyBackupDialog from './security/RestoreKeyBackupDialog';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.dialogs.LogoutDialog")
 export default class LogoutDialog extends React.Component {
     defaultProps = {
         onFinished: function() {},
diff --git a/src/components/views/dialogs/ManualDeviceKeyVerificationDialog.js b/src/components/views/dialogs/ManualDeviceKeyVerificationDialog.js
index 4b9d7239e6..3151edd796 100644
--- a/src/components/views/dialogs/ManualDeviceKeyVerificationDialog.js
+++ b/src/components/views/dialogs/ManualDeviceKeyVerificationDialog.js
@@ -24,7 +24,9 @@ import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import * as sdk from '../../../index';
 import * as FormattingUtils from '../../../utils/FormattingUtils';
 import { _t } from '../../../languageHandler';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.dialogs.ManualDeviceKeyVerificationDialog")
 export default class ManualDeviceKeyVerificationDialog extends React.Component {
     static propTypes = {
         userId: PropTypes.string.isRequired,
diff --git a/src/components/views/dialogs/MessageEditHistoryDialog.js b/src/components/views/dialogs/MessageEditHistoryDialog.js
index 2bdf2be35c..7585561c0c 100644
--- a/src/components/views/dialogs/MessageEditHistoryDialog.js
+++ b/src/components/views/dialogs/MessageEditHistoryDialog.js
@@ -21,7 +21,9 @@ import { _t } from '../../../languageHandler';
 import * as sdk from "../../../index";
 import {wantsDateSeparator} from '../../../DateUtils';
 import SettingsStore from '../../../settings/SettingsStore';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.dialogs.MessageEditHistoryDialog")
 export default class MessageEditHistoryDialog extends React.PureComponent {
     static propTypes = {
         mxEvent: PropTypes.object.isRequired,
diff --git a/src/components/views/dialogs/ModalWidgetDialog.tsx b/src/components/views/dialogs/ModalWidgetDialog.tsx
index 92fb406965..59eaab7b81 100644
--- a/src/components/views/dialogs/ModalWidgetDialog.tsx
+++ b/src/components/views/dialogs/ModalWidgetDialog.tsx
@@ -38,6 +38,7 @@ import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import {OwnProfileStore} from "../../../stores/OwnProfileStore";
 import { arrayFastClone } from "../../../utils/arrays";
 import { ElementWidget } from "../../../stores/widgets/StopGapWidget";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 interface IProps {
     widgetDefinition: IModalWidgetOpenRequestData;
@@ -53,6 +54,7 @@ interface IState {
 
 const MAX_BUTTONS = 3;
 
+@replaceableComponent("views.dialogs.ModalWidgetDialog")
 export default class ModalWidgetDialog extends React.PureComponent<IProps, IState> {
     private readonly widget: Widget;
     private readonly possibleButtons: ModalButtonID[];
diff --git a/src/components/views/dialogs/ReportEventDialog.js b/src/components/views/dialogs/ReportEventDialog.js
index f5509dec4d..67ed0f8f53 100644
--- a/src/components/views/dialogs/ReportEventDialog.js
+++ b/src/components/views/dialogs/ReportEventDialog.js
@@ -22,10 +22,12 @@ import {MatrixEvent} from "matrix-js-sdk";
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import SdkConfig from '../../../SdkConfig';
 import Markdown from '../../../Markdown';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 /*
  * A dialog for reporting an event.
  */
+@replaceableComponent("views.dialogs.ReportEventDialog")
 export default class ReportEventDialog extends PureComponent {
     static propTypes = {
         mxEvent: PropTypes.instanceOf(MatrixEvent).isRequired,
diff --git a/src/components/views/dialogs/RoomSettingsDialog.js b/src/components/views/dialogs/RoomSettingsDialog.js
index 9d9313f08f..045d11404a 100644
--- a/src/components/views/dialogs/RoomSettingsDialog.js
+++ b/src/components/views/dialogs/RoomSettingsDialog.js
@@ -30,6 +30,7 @@ import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import dis from "../../../dispatcher/dispatcher";
 import SettingsStore from "../../../settings/SettingsStore";
 import {UIFeature} from "../../../settings/UIFeature";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 export const ROOM_GENERAL_TAB = "ROOM_GENERAL_TAB";
 export const ROOM_SECURITY_TAB = "ROOM_SECURITY_TAB";
@@ -38,6 +39,7 @@ export const ROOM_NOTIFICATIONS_TAB = "ROOM_NOTIFICATIONS_TAB";
 export const ROOM_BRIDGES_TAB = "ROOM_BRIDGES_TAB";
 export const ROOM_ADVANCED_TAB = "ROOM_ADVANCED_TAB";
 
+@replaceableComponent("views.dialogs.RoomSettingsDialog")
 export default class RoomSettingsDialog extends React.Component {
     static propTypes = {
         roomId: PropTypes.string.isRequired,
diff --git a/src/components/views/dialogs/RoomUpgradeDialog.js b/src/components/views/dialogs/RoomUpgradeDialog.js
index 85e97444ed..8f9ed42ada 100644
--- a/src/components/views/dialogs/RoomUpgradeDialog.js
+++ b/src/components/views/dialogs/RoomUpgradeDialog.js
@@ -20,7 +20,9 @@ import * as sdk from '../../../index';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import Modal from '../../../Modal';
 import { _t } from '../../../languageHandler';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.dialogs.RoomUpgradeDialog")
 export default class RoomUpgradeDialog extends React.Component {
     static propTypes = {
         room: PropTypes.object.isRequired,
diff --git a/src/components/views/dialogs/RoomUpgradeWarningDialog.js b/src/components/views/dialogs/RoomUpgradeWarningDialog.js
index c83528c5ba..452ac56dff 100644
--- a/src/components/views/dialogs/RoomUpgradeWarningDialog.js
+++ b/src/components/views/dialogs/RoomUpgradeWarningDialog.js
@@ -22,7 +22,9 @@ import * as sdk from "../../../index";
 import LabelledToggleSwitch from "../elements/LabelledToggleSwitch";
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import Modal from "../../../Modal";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.dialogs.RoomUpgradeWarningDialog")
 export default class RoomUpgradeWarningDialog extends React.Component {
     static propTypes = {
         onFinished: PropTypes.func.isRequired,
diff --git a/src/components/views/dialogs/ServerOfflineDialog.tsx b/src/components/views/dialogs/ServerOfflineDialog.tsx
index 81f628343b..52ff056907 100644
--- a/src/components/views/dialogs/ServerOfflineDialog.tsx
+++ b/src/components/views/dialogs/ServerOfflineDialog.tsx
@@ -28,10 +28,12 @@ import AccessibleButton from "../elements/AccessibleButton";
 import { UPDATE_EVENT } from "../../../stores/AsyncStore";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import { IDialogProps } from "./IDialogProps";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 interface IProps extends IDialogProps {
 }
 
+@replaceableComponent("views.dialogs.ServerOfflineDialog")
 export default class ServerOfflineDialog extends React.PureComponent<IProps> {
     public componentDidMount() {
         EchoStore.instance.on(UPDATE_EVENT, this.onEchosUpdated);
diff --git a/src/components/views/dialogs/ServerPickerDialog.tsx b/src/components/views/dialogs/ServerPickerDialog.tsx
index 7ca115760e..4abc0a88b1 100644
--- a/src/components/views/dialogs/ServerPickerDialog.tsx
+++ b/src/components/views/dialogs/ServerPickerDialog.tsx
@@ -26,6 +26,7 @@ import Field from "../elements/Field";
 import StyledRadioButton from "../elements/StyledRadioButton";
 import TextWithTooltip from "../elements/TextWithTooltip";
 import withValidation, {IFieldState} from "../elements/Validation";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 interface IProps {
     title?: string;
@@ -38,6 +39,7 @@ interface IState {
     otherHomeserver: string;
 }
 
+@replaceableComponent("views.dialogs.ServerPickerDialog")
 export default class ServerPickerDialog extends React.PureComponent<IProps, IState> {
     private readonly defaultServer: ValidatedServerConfig;
     private readonly fieldRef = createRef<Field>();
diff --git a/src/components/views/dialogs/SessionRestoreErrorDialog.js b/src/components/views/dialogs/SessionRestoreErrorDialog.js
index bae6b19fbe..50d7fbea09 100644
--- a/src/components/views/dialogs/SessionRestoreErrorDialog.js
+++ b/src/components/views/dialogs/SessionRestoreErrorDialog.js
@@ -22,8 +22,9 @@ import * as sdk from '../../../index';
 import SdkConfig from '../../../SdkConfig';
 import Modal from '../../../Modal';
 import { _t } from '../../../languageHandler';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
-
+@replaceableComponent("views.dialogs.SessionRestoreErrorDialog")
 export default class SessionRestoreErrorDialog extends React.Component {
     static propTypes = {
         error: PropTypes.string.isRequired,
diff --git a/src/components/views/dialogs/SetEmailDialog.js b/src/components/views/dialogs/SetEmailDialog.js
index 6514d94dc9..0f8f410a6a 100644
--- a/src/components/views/dialogs/SetEmailDialog.js
+++ b/src/components/views/dialogs/SetEmailDialog.js
@@ -22,6 +22,7 @@ import * as Email from '../../../email';
 import AddThreepid from '../../../AddThreepid';
 import { _t } from '../../../languageHandler';
 import Modal from '../../../Modal';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 
 /*
@@ -29,6 +30,7 @@ import Modal from '../../../Modal';
  *
  * On success, `onFinished(true)` is called.
  */
+@replaceableComponent("views.dialogs.SetEmailDialog")
 export default class SetEmailDialog extends React.Component {
     static propTypes = {
         onFinished: PropTypes.func.isRequired,
diff --git a/src/components/views/dialogs/ShareDialog.tsx b/src/components/views/dialogs/ShareDialog.tsx
index 5264031cc6..df1206a4f0 100644
--- a/src/components/views/dialogs/ShareDialog.tsx
+++ b/src/components/views/dialogs/ShareDialog.tsx
@@ -34,6 +34,7 @@ import AccessibleTooltipButton from '../elements/AccessibleTooltipButton';
 import { IDialogProps } from "./IDialogProps";
 import SettingsStore from "../../../settings/SettingsStore";
 import {UIFeature} from "../../../settings/UIFeature";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 const socials = [
     {
@@ -73,6 +74,7 @@ interface IState {
     permalinkCreator: RoomPermalinkCreator;
 }
 
+@replaceableComponent("views.dialogs.ShareDialog")
 export default class ShareDialog extends React.PureComponent<IProps, IState> {
     static propTypes = {
         onFinished: PropTypes.func.isRequired,
diff --git a/src/components/views/dialogs/StorageEvictedDialog.js b/src/components/views/dialogs/StorageEvictedDialog.js
index a22f302807..15c5347644 100644
--- a/src/components/views/dialogs/StorageEvictedDialog.js
+++ b/src/components/views/dialogs/StorageEvictedDialog.js
@@ -20,7 +20,9 @@ import * as sdk from '../../../index';
 import SdkConfig from '../../../SdkConfig';
 import Modal from '../../../Modal';
 import { _t } from '../../../languageHandler';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.dialogs.StorageEvictedDialog")
 export default class StorageEvictedDialog extends React.Component {
     static propTypes = {
         onFinished: PropTypes.func.isRequired,
diff --git a/src/components/views/dialogs/TabbedIntegrationManagerDialog.js b/src/components/views/dialogs/TabbedIntegrationManagerDialog.js
index 9f5c9f6a11..07e29adcff 100644
--- a/src/components/views/dialogs/TabbedIntegrationManagerDialog.js
+++ b/src/components/views/dialogs/TabbedIntegrationManagerDialog.js
@@ -22,7 +22,9 @@ import * as sdk from '../../../index';
 import {dialogTermsInteractionCallback, TermsNotSignedError} from "../../../Terms";
 import classNames from 'classnames';
 import * as ScalarMessaging from "../../../ScalarMessaging";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.dialogs.TabbedIntegrationManagerDialog")
 export default class TabbedIntegrationManagerDialog extends React.Component {
     static propTypes = {
         /**
diff --git a/src/components/views/dialogs/TermsDialog.js b/src/components/views/dialogs/TermsDialog.js
index 402605c545..72e6c3f3a0 100644
--- a/src/components/views/dialogs/TermsDialog.js
+++ b/src/components/views/dialogs/TermsDialog.js
@@ -21,6 +21,7 @@ import * as sdk from '../../../index';
 import { _t, pickBestLanguage } from '../../../languageHandler';
 
 import Matrix from 'matrix-js-sdk';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 class TermsCheckbox extends React.PureComponent {
     static propTypes = {
@@ -41,6 +42,7 @@ class TermsCheckbox extends React.PureComponent {
     }
 }
 
+@replaceableComponent("views.dialogs.TermsDialog")
 export default class TermsDialog extends React.PureComponent {
     static propTypes = {
         /**
diff --git a/src/components/views/dialogs/TextInputDialog.js b/src/components/views/dialogs/TextInputDialog.js
index 69cc4390be..97abd209c0 100644
--- a/src/components/views/dialogs/TextInputDialog.js
+++ b/src/components/views/dialogs/TextInputDialog.js
@@ -19,7 +19,9 @@ import PropTypes from 'prop-types';
 import * as sdk from '../../../index';
 import Field from "../elements/Field";
 import { _t, _td } from '../../../languageHandler';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.dialogs.TextInputDialog")
 export default class TextInputDialog extends React.Component {
     static propTypes = {
         title: PropTypes.string,
diff --git a/src/components/views/dialogs/UploadConfirmDialog.js b/src/components/views/dialogs/UploadConfirmDialog.js
index e3521eb282..2ff16b9440 100644
--- a/src/components/views/dialogs/UploadConfirmDialog.js
+++ b/src/components/views/dialogs/UploadConfirmDialog.js
@@ -20,7 +20,9 @@ import PropTypes from 'prop-types';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import filesize from "filesize";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.dialogs.UploadConfirmDialog")
 export default class UploadConfirmDialog extends React.Component {
     static propTypes = {
         file: PropTypes.object.isRequired,
diff --git a/src/components/views/dialogs/UploadFailureDialog.js b/src/components/views/dialogs/UploadFailureDialog.js
index 4be1656f66..d220d6c684 100644
--- a/src/components/views/dialogs/UploadFailureDialog.js
+++ b/src/components/views/dialogs/UploadFailureDialog.js
@@ -21,12 +21,14 @@ import PropTypes from 'prop-types';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import ContentMessages from '../../../ContentMessages';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 /*
  * Tells the user about files we know cannot be uploaded before we even try uploading
  * them. This is named fairly generically but the only thing we check right now is
  * the size of the file.
  */
+@replaceableComponent("views.dialogs.UploadFailureDialog")
 export default class UploadFailureDialog extends React.Component {
     static propTypes = {
         badFiles: PropTypes.arrayOf(PropTypes.object).isRequired,
diff --git a/src/components/views/dialogs/UserSettingsDialog.js b/src/components/views/dialogs/UserSettingsDialog.js
index 7164540aea..32abef874b 100644
--- a/src/components/views/dialogs/UserSettingsDialog.js
+++ b/src/components/views/dialogs/UserSettingsDialog.js
@@ -33,6 +33,7 @@ import * as sdk from "../../../index";
 import SdkConfig from "../../../SdkConfig";
 import MjolnirUserSettingsTab from "../settings/tabs/user/MjolnirUserSettingsTab";
 import {UIFeature} from "../../../settings/UIFeature";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 export const USER_GENERAL_TAB = "USER_GENERAL_TAB";
 export const USER_APPEARANCE_TAB = "USER_APPEARANCE_TAB";
@@ -45,6 +46,7 @@ export const USER_LABS_TAB = "USER_LABS_TAB";
 export const USER_MJOLNIR_TAB = "USER_MJOLNIR_TAB";
 export const USER_HELP_TAB = "USER_HELP_TAB";
 
+@replaceableComponent("views.dialogs.UserSettingsDialog")
 export default class UserSettingsDialog extends React.Component {
     static propTypes = {
         onFinished: PropTypes.func.isRequired,
diff --git a/src/components/views/dialogs/VerificationRequestDialog.js b/src/components/views/dialogs/VerificationRequestDialog.js
index 3a6e9a2d10..574beebbc6 100644
--- a/src/components/views/dialogs/VerificationRequestDialog.js
+++ b/src/components/views/dialogs/VerificationRequestDialog.js
@@ -19,7 +19,9 @@ import PropTypes from 'prop-types';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.dialogs.VerificationRequestDialog")
 export default class VerificationRequestDialog extends React.Component {
     static propTypes = {
         verificationRequest: PropTypes.object,
diff --git a/src/components/views/dialogs/WidgetCapabilitiesPromptDialog.tsx b/src/components/views/dialogs/WidgetCapabilitiesPromptDialog.tsx
index 535e0b7b8e..70fe7fe5e3 100644
--- a/src/components/views/dialogs/WidgetCapabilitiesPromptDialog.tsx
+++ b/src/components/views/dialogs/WidgetCapabilitiesPromptDialog.tsx
@@ -29,6 +29,7 @@ import StyledCheckbox from "../elements/StyledCheckbox";
 import DialogButtons from "../elements/DialogButtons";
 import LabelledToggleSwitch from "../elements/LabelledToggleSwitch";
 import { CapabilityText } from "../../../widgets/CapabilityText";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 export function getRememberedCapabilitiesForWidget(widget: Widget): Capability[] {
     return JSON.parse(localStorage.getItem(`widget_${widget.id}_approved_caps`) || "[]");
@@ -54,6 +55,7 @@ interface IState {
     rememberSelection: boolean;
 }
 
+@replaceableComponent("views.dialogs.WidgetCapabilitiesPromptDialog")
 export default class WidgetCapabilitiesPromptDialog extends React.PureComponent<IProps, IState> {
     private eventPermissionsMap = new Map<Capability, WidgetEventCapability>();
 
diff --git a/src/components/views/dialogs/WidgetOpenIDPermissionsDialog.js b/src/components/views/dialogs/WidgetOpenIDPermissionsDialog.js
index c01d3d39b8..f45adf9738 100644
--- a/src/components/views/dialogs/WidgetOpenIDPermissionsDialog.js
+++ b/src/components/views/dialogs/WidgetOpenIDPermissionsDialog.js
@@ -21,7 +21,9 @@ import * as sdk from "../../../index";
 import LabelledToggleSwitch from "../elements/LabelledToggleSwitch";
 import {Widget} from "matrix-widget-api";
 import {OIDCState, WidgetPermissionStore} from "../../../stores/widgets/WidgetPermissionStore";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.dialogs.WidgetOpenIDPermissionsDialog")
 export default class WidgetOpenIDPermissionsDialog extends React.Component {
     static propTypes = {
         onFinished: PropTypes.func.isRequired,
diff --git a/src/components/views/elements/AccessibleTooltipButton.tsx b/src/components/views/elements/AccessibleTooltipButton.tsx
index b7c7b78e63..3bb264fb3e 100644
--- a/src/components/views/elements/AccessibleTooltipButton.tsx
+++ b/src/components/views/elements/AccessibleTooltipButton.tsx
@@ -20,6 +20,7 @@ import classNames from 'classnames';
 
 import AccessibleButton from "./AccessibleButton";
 import Tooltip from './Tooltip';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 interface ITooltipProps extends React.ComponentProps<typeof AccessibleButton> {
     title: string;
@@ -33,6 +34,7 @@ interface IState {
     hover: boolean;
 }
 
+@replaceableComponent("views.elements.AccessibleTooltipButton")
 export default class AccessibleTooltipButton extends React.PureComponent<ITooltipProps, IState> {
     constructor(props: ITooltipProps) {
         super(props);
diff --git a/src/components/views/elements/ActionButton.js b/src/components/views/elements/ActionButton.js
index bec016bce0..1714891cb5 100644
--- a/src/components/views/elements/ActionButton.js
+++ b/src/components/views/elements/ActionButton.js
@@ -20,7 +20,9 @@ import AccessibleButton from './AccessibleButton';
 import dis from '../../../dispatcher/dispatcher';
 import * as sdk from '../../../index';
 import Analytics from '../../../Analytics';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.elements.ActionButton")
 export default class ActionButton extends React.Component {
     static propTypes = {
         size: PropTypes.string,
diff --git a/src/components/views/elements/AddressSelector.js b/src/components/views/elements/AddressSelector.js
index 2a71622bb8..33b2906870 100644
--- a/src/components/views/elements/AddressSelector.js
+++ b/src/components/views/elements/AddressSelector.js
@@ -20,7 +20,9 @@ import PropTypes from 'prop-types';
 import * as sdk from '../../../index';
 import classNames from 'classnames';
 import { UserAddressType } from '../../../UserAddress';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.elements.AddressSelector")
 export default class AddressSelector extends React.Component {
     static propTypes = {
         onSelected: PropTypes.func.isRequired,
diff --git a/src/components/views/elements/AddressTile.js b/src/components/views/elements/AddressTile.js
index dc6c6b2914..4a216dbae4 100644
--- a/src/components/views/elements/AddressTile.js
+++ b/src/components/views/elements/AddressTile.js
@@ -22,8 +22,9 @@ import * as sdk from "../../../index";
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import { _t } from '../../../languageHandler';
 import { UserAddressType } from '../../../UserAddress.js';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
-
+@replaceableComponent("views.elements.AddressTile")
 export default class AddressTile extends React.Component {
     static propTypes = {
         address: UserAddressType.isRequired,
diff --git a/src/components/views/elements/AppPermission.js b/src/components/views/elements/AppPermission.js
index ec8bffc32f..65e40ef19a 100644
--- a/src/components/views/elements/AppPermission.js
+++ b/src/components/views/elements/AppPermission.js
@@ -24,7 +24,9 @@ import { _t } from '../../../languageHandler';
 import SdkConfig from '../../../SdkConfig';
 import WidgetUtils from "../../../utils/WidgetUtils";
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.elements.AppPermission")
 export default class AppPermission extends React.Component {
     static propTypes = {
         url: PropTypes.string.isRequired,
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 2a72621ccc..e206fda797 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -38,7 +38,9 @@ import {ElementWidgetActions} from "../../../stores/widgets/ElementWidgetActions
 import {MatrixCapabilities} from "matrix-widget-api";
 import RoomWidgetContextMenu from "../context_menus/WidgetContextMenu";
 import WidgetAvatar from "../avatars/WidgetAvatar";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.elements.AppTile")
 export default class AppTile extends React.Component {
     constructor(props) {
         super(props);
diff --git a/src/components/views/elements/DesktopCapturerSourcePicker.tsx b/src/components/views/elements/DesktopCapturerSourcePicker.tsx
index 6ae465c362..2d066a7ed7 100644
--- a/src/components/views/elements/DesktopCapturerSourcePicker.tsx
+++ b/src/components/views/elements/DesktopCapturerSourcePicker.tsx
@@ -19,6 +19,7 @@ import { _t } from '../../../languageHandler';
 import BaseDialog from "..//dialogs/BaseDialog"
 import AccessibleButton from './AccessibleButton';
 import {getDesktopCapturerSources} from "matrix-js-sdk/src/webrtc/call";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 export interface DesktopCapturerSource {
     id: string;
@@ -69,6 +70,7 @@ export interface DesktopCapturerSourcePickerIProps {
     onFinished(source: DesktopCapturerSource): void;
 }
 
+@replaceableComponent("views.elements.DesktopCapturerSourcePicker")
 export default class DesktopCapturerSourcePicker extends React.Component<
     DesktopCapturerSourcePickerIProps,
     DesktopCapturerSourcePickerIState
diff --git a/src/components/views/elements/DialogButtons.js b/src/components/views/elements/DialogButtons.js
index 3417485eb8..dcb1cee077 100644
--- a/src/components/views/elements/DialogButtons.js
+++ b/src/components/views/elements/DialogButtons.js
@@ -19,10 +19,12 @@ limitations under the License.
 import React from "react";
 import PropTypes from "prop-types";
 import { _t } from '../../../languageHandler';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 /**
  * Basic container for buttons in modal dialogs.
  */
+@replaceableComponent("views.elements.DialogButtons")
 export default class DialogButtons extends React.Component {
     static propTypes = {
         // The primary button which is styled differently and has default focus.
diff --git a/src/components/views/elements/DirectorySearchBox.js b/src/components/views/elements/DirectorySearchBox.js
index 644b69417b..6447bb3cd8 100644
--- a/src/components/views/elements/DirectorySearchBox.js
+++ b/src/components/views/elements/DirectorySearchBox.js
@@ -18,7 +18,9 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.elements.DirectorySearchBox")
 export default class DirectorySearchBox extends React.Component {
     constructor(props) {
         super(props);
diff --git a/src/components/views/elements/Draggable.tsx b/src/components/views/elements/Draggable.tsx
index a6eb8323f3..6032721a48 100644
--- a/src/components/views/elements/Draggable.tsx
+++ b/src/components/views/elements/Draggable.tsx
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 interface IProps {
     className: string;
@@ -33,6 +34,7 @@ export interface ILocationState {
     currentY: number;
 }
 
+@replaceableComponent("views.elements.Draggable")
 export default class Draggable extends React.Component<IProps, IState> {
     constructor(props: IProps) {
         super(props);
diff --git a/src/components/views/elements/Dropdown.js b/src/components/views/elements/Dropdown.js
index 6b3efb5ee1..981c0becc0 100644
--- a/src/components/views/elements/Dropdown.js
+++ b/src/components/views/elements/Dropdown.js
@@ -22,6 +22,7 @@ import classnames from 'classnames';
 import AccessibleButton from './AccessibleButton';
 import { _t } from '../../../languageHandler';
 import {Key} from "../../../Keyboard";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 class MenuOption extends React.Component {
     constructor(props) {
@@ -83,6 +84,7 @@ MenuOption.propTypes = {
  *
  * TODO: Port NetworkDropdown to use this.
  */
+@replaceableComponent("views.elements.Dropdown")
 export default class Dropdown extends React.Component {
     constructor(props) {
         super(props);
diff --git a/src/components/views/elements/EditableItemList.js b/src/components/views/elements/EditableItemList.js
index 5a07a400d7..ff62f169fa 100644
--- a/src/components/views/elements/EditableItemList.js
+++ b/src/components/views/elements/EditableItemList.js
@@ -19,6 +19,7 @@ import PropTypes from 'prop-types';
 import {_t} from '../../../languageHandler';
 import Field from "./Field";
 import AccessibleButton from "./AccessibleButton";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 export class EditableItem extends React.Component {
     static propTypes = {
@@ -85,6 +86,7 @@ export class EditableItem extends React.Component {
     }
 }
 
+@replaceableComponent("views.elements.EditableItemList")
 export default class EditableItemList extends React.Component {
     static propTypes = {
         id: PropTypes.string.isRequired,
diff --git a/src/components/views/elements/EditableText.js b/src/components/views/elements/EditableText.js
index 49eb331aef..638fd02553 100644
--- a/src/components/views/elements/EditableText.js
+++ b/src/components/views/elements/EditableText.js
@@ -18,7 +18,9 @@ limitations under the License.
 import React, {createRef} from 'react';
 import PropTypes from 'prop-types';
 import {Key} from "../../../Keyboard";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.elements.EditableText")
 export default class EditableText extends React.Component {
     static propTypes = {
         onValueChanged: PropTypes.func,
diff --git a/src/components/views/elements/EditableTextContainer.js b/src/components/views/elements/EditableTextContainer.js
index bbc5560557..e925220089 100644
--- a/src/components/views/elements/EditableTextContainer.js
+++ b/src/components/views/elements/EditableTextContainer.js
@@ -17,6 +17,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import * as sdk from '../../../index';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 /**
  * A component which wraps an EditableText, with a spinner while updates take
@@ -29,6 +30,7 @@ import * as sdk from '../../../index';
  * similarly asynchronous way. If this is not provided, the initial value is
  * taken from the 'initialValue' property.
  */
+@replaceableComponent("views.elements.EditableTextContainer")
 export default class EditableTextContainer extends React.Component {
     constructor(props) {
         super(props);
diff --git a/src/components/views/elements/ErrorBoundary.js b/src/components/views/elements/ErrorBoundary.js
index 9fe6861250..9037287f49 100644
--- a/src/components/views/elements/ErrorBoundary.js
+++ b/src/components/views/elements/ErrorBoundary.js
@@ -21,11 +21,13 @@ import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import PlatformPeg from '../../../PlatformPeg';
 import Modal from '../../../Modal';
 import SdkConfig from "../../../SdkConfig";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 /**
  * This error boundary component can be used to wrap large content areas and
  * catch exceptions during rendering in the component tree below them.
  */
+@replaceableComponent("views.elements.ErrorBoundary")
 export default class ErrorBoundary extends React.PureComponent {
     constructor(props) {
         super(props);
diff --git a/src/components/views/elements/EventTilePreview.tsx b/src/components/views/elements/EventTilePreview.tsx
index 49c97831bc..c539f2be1c 100644
--- a/src/components/views/elements/EventTilePreview.tsx
+++ b/src/components/views/elements/EventTilePreview.tsx
@@ -24,6 +24,7 @@ import EventTile from '../rooms/EventTile';
 import SettingsStore from "../../../settings/SettingsStore";
 import {Layout} from "../../../settings/Layout";
 import {UIFeature} from "../../../settings/UIFeature";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 interface IProps {
     /**
@@ -52,6 +53,7 @@ interface IState {
 
 const AVATAR_SIZE = 32;
 
+@replaceableComponent("views.elements.EventTilePreview")
 export default class EventTilePreview extends React.Component<IProps, IState> {
     constructor(props: IProps) {
         super(props);
diff --git a/src/components/views/elements/Flair.js b/src/components/views/elements/Flair.js
index 0f06904b68..04eba5bc42 100644
--- a/src/components/views/elements/Flair.js
+++ b/src/components/views/elements/Flair.js
@@ -21,6 +21,7 @@ import PropTypes from 'prop-types';
 import FlairStore from '../../../stores/FlairStore';
 import dis from '../../../dispatcher/dispatcher';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 
 class FlairAvatar extends React.Component {
@@ -64,6 +65,7 @@ FlairAvatar.propTypes = {
 
 FlairAvatar.contextType = MatrixClientContext;
 
+@replaceableComponent("views.elements.Flair")
 export default class Flair extends React.Component {
     constructor() {
         super();
diff --git a/src/components/views/elements/IRCTimelineProfileResizer.tsx b/src/components/views/elements/IRCTimelineProfileResizer.tsx
index ecd63816de..cd1ccf2fc4 100644
--- a/src/components/views/elements/IRCTimelineProfileResizer.tsx
+++ b/src/components/views/elements/IRCTimelineProfileResizer.tsx
@@ -18,6 +18,7 @@ import React from 'react';
 import SettingsStore from "../../../settings/SettingsStore";
 import Draggable, {ILocationState} from './Draggable';
 import { SettingLevel } from "../../../settings/SettingLevel";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 interface IProps {
     // Current room
@@ -31,6 +32,7 @@ interface IState {
     IRCLayoutRoot: HTMLElement;
 }
 
+@replaceableComponent("views.elements.IRCTimelineProfileResizer")
 export default class IRCTimelineProfileResizer extends React.Component<IProps, IState> {
     constructor(props: IProps) {
         super(props);
diff --git a/src/components/views/elements/ImageView.js b/src/components/views/elements/ImageView.js
index e39075cedc..96b6de832d 100644
--- a/src/components/views/elements/ImageView.js
+++ b/src/components/views/elements/ImageView.js
@@ -26,7 +26,9 @@ import Modal from "../../../Modal";
 import * as sdk from "../../../index";
 import {Key} from "../../../Keyboard";
 import FocusLock from "react-focus-lock";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.elements.ImageView")
 export default class ImageView extends React.Component {
     static propTypes = {
         src: PropTypes.string.isRequired, // the source of the image being displayed
diff --git a/src/components/views/elements/InfoTooltip.tsx b/src/components/views/elements/InfoTooltip.tsx
index dd21c95b74..8f7f1ea53f 100644
--- a/src/components/views/elements/InfoTooltip.tsx
+++ b/src/components/views/elements/InfoTooltip.tsx
@@ -20,6 +20,7 @@ import classNames from 'classnames';
 
 import Tooltip from './Tooltip';
 import { _t } from "../../../languageHandler";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 interface ITooltipProps {
     tooltip?: React.ReactNode;
@@ -30,6 +31,7 @@ interface IState {
     hover: boolean;
 }
 
+@replaceableComponent("views.elements.InfoTooltip")
 export default class InfoTooltip extends React.PureComponent<ITooltipProps, IState> {
     constructor(props: ITooltipProps) {
         super(props);
diff --git a/src/components/views/elements/InlineSpinner.js b/src/components/views/elements/InlineSpinner.js
index 73316157f4..3654a1f34c 100644
--- a/src/components/views/elements/InlineSpinner.js
+++ b/src/components/views/elements/InlineSpinner.js
@@ -17,7 +17,9 @@ limitations under the License.
 import React from "react";
 import {_t} from "../../../languageHandler";
 import SettingsStore from "../../../settings/SettingsStore";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.elements.InlineSpinner")
 export default class InlineSpinner extends React.Component {
     render() {
         const w = this.props.w || 16;
diff --git a/src/components/views/elements/LabelledToggleSwitch.js b/src/components/views/elements/LabelledToggleSwitch.js
index 78beb2aa91..e6378f0e6a 100644
--- a/src/components/views/elements/LabelledToggleSwitch.js
+++ b/src/components/views/elements/LabelledToggleSwitch.js
@@ -17,7 +17,9 @@ limitations under the License.
 import React from 'react';
 import PropTypes from "prop-types";
 import ToggleSwitch from "./ToggleSwitch";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.elements.LabelledToggleSwitch")
 export default class LabelledToggleSwitch extends React.Component {
     static propTypes = {
         // The value for the toggle switch
diff --git a/src/components/views/elements/LanguageDropdown.js b/src/components/views/elements/LanguageDropdown.js
index 03ec456af5..2e961be700 100644
--- a/src/components/views/elements/LanguageDropdown.js
+++ b/src/components/views/elements/LanguageDropdown.js
@@ -22,6 +22,7 @@ import * as sdk from '../../../index';
 import * as languageHandler from '../../../languageHandler';
 import SettingsStore from "../../../settings/SettingsStore";
 import { _t } from "../../../languageHandler";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 function languageMatchesSearchQuery(query, language) {
     if (language.label.toUpperCase().includes(query.toUpperCase())) return true;
@@ -29,6 +30,7 @@ function languageMatchesSearchQuery(query, language) {
     return false;
 }
 
+@replaceableComponent("views.elements.LanguageDropdown")
 export default class LanguageDropdown extends React.Component {
     constructor(props) {
         super(props);
diff --git a/src/components/views/elements/LazyRenderList.js b/src/components/views/elements/LazyRenderList.js
index 7572dced0b..f2c8148cd2 100644
--- a/src/components/views/elements/LazyRenderList.js
+++ b/src/components/views/elements/LazyRenderList.js
@@ -16,6 +16,7 @@ limitations under the License.
 
 import React from "react";
 import PropTypes from 'prop-types';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 class ItemRange {
     constructor(topCount, renderCount, bottomCount) {
@@ -55,6 +56,7 @@ class ItemRange {
     }
 }
 
+@replaceableComponent("views.elements.LazyRenderList")
 export default class LazyRenderList extends React.Component {
     constructor(props) {
         super(props);
diff --git a/src/components/views/elements/MemberEventListSummary.tsx b/src/components/views/elements/MemberEventListSummary.tsx
index 073bedf207..0290ef6d83 100644
--- a/src/components/views/elements/MemberEventListSummary.tsx
+++ b/src/components/views/elements/MemberEventListSummary.tsx
@@ -24,6 +24,7 @@ import { _t } from '../../../languageHandler';
 import { formatCommaSeparatedList } from '../../../utils/FormattingUtils';
 import { isValid3pidInvite } from "../../../RoomInvite";
 import EventListSummary from "./EventListSummary";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 interface IProps {
     // An array of member events to summarise
@@ -69,6 +70,7 @@ enum TransitionType {
 
 const SEP = ",";
 
+@replaceableComponent("views.elements.MemberEventListSummary")
 export default class MemberEventListSummary extends React.Component<IProps> {
     static defaultProps = {
         summaryLength: 1,
diff --git a/src/components/views/elements/PersistedElement.js b/src/components/views/elements/PersistedElement.js
index 3732f644b8..f504b3e97f 100644
--- a/src/components/views/elements/PersistedElement.js
+++ b/src/components/views/elements/PersistedElement.js
@@ -24,6 +24,7 @@ import dis from '../../../dispatcher/dispatcher';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import {isNullOrUndefined} from "matrix-js-sdk/src/utils";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 // Shamelessly ripped off Modal.js.  There's probably a better way
 // of doing reusable widgets like dialog boxes & menus where we go and
@@ -56,6 +57,7 @@ function getOrCreateContainer(containerId) {
  * children are made visible and are positioned into a div that is given the same
  * bounding rect as the parent of PE.
  */
+@replaceableComponent("views.elements.PersistedElement")
 export default class PersistedElement extends React.Component {
     static propTypes = {
         // Unique identifier for this PersistedElement instance
diff --git a/src/components/views/elements/PersistentApp.js b/src/components/views/elements/PersistentApp.js
index 7801076c66..5df373e4fe 100644
--- a/src/components/views/elements/PersistentApp.js
+++ b/src/components/views/elements/PersistentApp.js
@@ -21,7 +21,9 @@ import ActiveWidgetStore from '../../../stores/ActiveWidgetStore';
 import WidgetUtils from '../../../utils/WidgetUtils';
 import * as sdk from '../../../index';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.elements.PersistentApp")
 export default class PersistentApp extends React.Component {
     state = {
         roomId: RoomViewStore.getRoomId(),
diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js
index c6806c289e..b0d4fc7fa2 100644
--- a/src/components/views/elements/Pill.js
+++ b/src/components/views/elements/Pill.js
@@ -27,7 +27,9 @@ import {getPrimaryPermalinkEntity, parseAppLocalLink} from "../../../utils/perma
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import {Action} from "../../../dispatcher/actions";
 import Tooltip from './Tooltip';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.elements.Pill")
 class Pill extends React.Component {
     static roomNotifPos(text) {
         return text.indexOf("@room");
diff --git a/src/components/views/elements/PowerSelector.js b/src/components/views/elements/PowerSelector.js
index 66922df0f8..622bed9890 100644
--- a/src/components/views/elements/PowerSelector.js
+++ b/src/components/views/elements/PowerSelector.js
@@ -20,7 +20,9 @@ import * as Roles from '../../../Roles';
 import { _t } from '../../../languageHandler';
 import Field from "./Field";
 import {Key} from "../../../Keyboard";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.elements.PowerSelector")
 export default class PowerSelector extends React.Component {
     static propTypes = {
         value: PropTypes.number.isRequired,
diff --git a/src/components/views/elements/ReplyThread.js b/src/components/views/elements/ReplyThread.js
index 27d773b099..2e0cc50435 100644
--- a/src/components/views/elements/ReplyThread.js
+++ b/src/components/views/elements/ReplyThread.js
@@ -31,10 +31,12 @@ import {Action} from "../../../dispatcher/actions";
 import sanitizeHtml from "sanitize-html";
 import {UIFeature} from "../../../settings/UIFeature";
 import {PERMITTED_URL_SCHEMES} from "../../../HtmlUtils";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 // This component does no cycle detection, simply because the only way to make such a cycle would be to
 // craft event_id's, using a homeserver that generates predictable event IDs; even then the impact would
 // be low as each event being loaded (after the first) is triggered by an explicit user action.
+@replaceableComponent("views.elements.ReplyThread")
 export default class ReplyThread extends React.Component {
     static propTypes = {
         // the latest event in this chain of replies
diff --git a/src/components/views/elements/RoomAliasField.js b/src/components/views/elements/RoomAliasField.js
index 04bbe1c3de..1db154c2cd 100644
--- a/src/components/views/elements/RoomAliasField.js
+++ b/src/components/views/elements/RoomAliasField.js
@@ -19,8 +19,10 @@ import PropTypes from 'prop-types';
 import * as sdk from '../../../index';
 import withValidation from './Validation';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 // Controlled form component wrapping Field for inputting a room alias scoped to a given domain
+@replaceableComponent("views.elements.RoomAliasField")
 export default class RoomAliasField extends React.PureComponent {
     static propTypes = {
         domain: PropTypes.string.isRequired,
diff --git a/src/components/views/elements/SettingsFlag.tsx b/src/components/views/elements/SettingsFlag.tsx
index 03e91fac62..4f885ab47d 100644
--- a/src/components/views/elements/SettingsFlag.tsx
+++ b/src/components/views/elements/SettingsFlag.tsx
@@ -21,6 +21,7 @@ import { _t } from '../../../languageHandler';
 import ToggleSwitch from "./ToggleSwitch";
 import StyledCheckbox from "./StyledCheckbox";
 import { SettingLevel } from "../../../settings/SettingLevel";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 interface IProps {
     // The setting must be a boolean
@@ -39,6 +40,7 @@ interface IState {
     value: boolean;
 }
 
+@replaceableComponent("views.elements.SettingsFlag")
 export default class SettingsFlag extends React.Component<IProps, IState> {
     constructor(props: IProps) {
         super(props);
diff --git a/src/components/views/elements/Slider.tsx b/src/components/views/elements/Slider.tsx
index b7c8e1b533..b513f90460 100644
--- a/src/components/views/elements/Slider.tsx
+++ b/src/components/views/elements/Slider.tsx
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import * as React from 'react';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 interface IProps {
     // A callback for the selected value
@@ -34,6 +35,7 @@ interface IProps {
     disabled: boolean;
 }
 
+@replaceableComponent("views.elements.Slider")
 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
diff --git a/src/components/views/elements/SpellCheckLanguagesDropdown.tsx b/src/components/views/elements/SpellCheckLanguagesDropdown.tsx
index c647f6e410..06e1efe415 100644
--- a/src/components/views/elements/SpellCheckLanguagesDropdown.tsx
+++ b/src/components/views/elements/SpellCheckLanguagesDropdown.tsx
@@ -21,6 +21,7 @@ import * as sdk from '../../../index';
 import PlatformPeg from "../../../PlatformPeg";
 import SettingsStore from "../../../settings/SettingsStore";
 import { _t } from "../../../languageHandler";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 function languageMatchesSearchQuery(query, language) {
     if (language.label.toUpperCase().includes(query.toUpperCase())) return true;
@@ -39,6 +40,7 @@ interface SpellCheckLanguagesDropdownIState {
     languages: any,
 }
 
+@replaceableComponent("views.elements.SpellCheckLanguagesDropdown")
 export default class SpellCheckLanguagesDropdown extends React.Component<SpellCheckLanguagesDropdownIProps,
                                                                          SpellCheckLanguagesDropdownIState> {
     constructor(props) {
diff --git a/src/components/views/elements/Spoiler.js b/src/components/views/elements/Spoiler.js
index b75967b225..33b4382a2c 100644
--- a/src/components/views/elements/Spoiler.js
+++ b/src/components/views/elements/Spoiler.js
@@ -15,7 +15,9 @@
  */
 
 import React from 'react';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.elements.Spoiler")
 export default class Spoiler extends React.Component {
     constructor(props) {
         super(props);
diff --git a/src/components/views/elements/StyledCheckbox.tsx b/src/components/views/elements/StyledCheckbox.tsx
index f8d2665d07..2454d1336b 100644
--- a/src/components/views/elements/StyledCheckbox.tsx
+++ b/src/components/views/elements/StyledCheckbox.tsx
@@ -16,6 +16,7 @@ limitations under the License.
 
 import React from "react";
 import { randomString } from "matrix-js-sdk/src/randomstring";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 interface IProps extends React.InputHTMLAttributes<HTMLInputElement> {
 }
@@ -23,6 +24,7 @@ interface IProps extends React.InputHTMLAttributes<HTMLInputElement> {
 interface IState {
 }
 
+@replaceableComponent("views.elements.StyledCheckbox")
 export default class StyledCheckbox extends React.PureComponent<IProps, IState> {
     private id: string;
 
diff --git a/src/components/views/elements/StyledRadioButton.tsx b/src/components/views/elements/StyledRadioButton.tsx
index 2efd084861..835394e055 100644
--- a/src/components/views/elements/StyledRadioButton.tsx
+++ b/src/components/views/elements/StyledRadioButton.tsx
@@ -16,6 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import classnames from 'classnames';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 interface IProps extends React.InputHTMLAttributes<HTMLInputElement> {
     outlined?: boolean;
@@ -24,6 +25,7 @@ interface IProps extends React.InputHTMLAttributes<HTMLInputElement> {
 interface IState {
 }
 
+@replaceableComponent("views.elements.StyledRadioButton")
 export default class StyledRadioButton extends React.PureComponent<IProps, IState> {
     public static readonly defaultProps = {
         className: '',
diff --git a/src/components/views/elements/SyntaxHighlight.js b/src/components/views/elements/SyntaxHighlight.js
index a4dc97d46e..f9874c5367 100644
--- a/src/components/views/elements/SyntaxHighlight.js
+++ b/src/components/views/elements/SyntaxHighlight.js
@@ -17,7 +17,9 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import {highlightBlock} from 'highlight.js';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.elements.SyntaxHighlight")
 export default class SyntaxHighlight extends React.Component {
     static propTypes = {
         className: PropTypes.string,
diff --git a/src/components/views/elements/TagTile.js b/src/components/views/elements/TagTile.js
index 6c9a01a840..663acd6329 100644
--- a/src/components/views/elements/TagTile.js
+++ b/src/components/views/elements/TagTile.js
@@ -30,12 +30,14 @@ import GroupFilterOrderStore from '../../../stores/GroupFilterOrderStore';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import AccessibleButton from "./AccessibleButton";
 import SettingsStore from "../../../settings/SettingsStore";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 // A class for a child of GroupFilterPanel (possibly wrapped in a DNDTagTile) that represents
 // a thing to click on for the user to filter the visible rooms in the RoomList to:
 //  - Rooms that are part of the group
 //  - Direct messages with members of the group
 // with the intention that this could be expanded to arbitrary tags in future.
+@replaceableComponent("views.elements.TagTile")
 export default class TagTile extends React.Component {
     static propTypes = {
         // A string tag such as "m.favourite" or a group ID such as "+groupid:domain.bla"
diff --git a/src/components/views/elements/TextWithTooltip.js b/src/components/views/elements/TextWithTooltip.js
index b0405dc4c9..e4ad234ae2 100644
--- a/src/components/views/elements/TextWithTooltip.js
+++ b/src/components/views/elements/TextWithTooltip.js
@@ -17,7 +17,9 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import * as sdk from '../../../index';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.elements.TextWithTooltip")
 export default class TextWithTooltip extends React.Component {
     static propTypes = {
         class: PropTypes.string,
diff --git a/src/components/views/elements/TintableSvg.js b/src/components/views/elements/TintableSvg.js
index df55b0a854..690deeedcd 100644
--- a/src/components/views/elements/TintableSvg.js
+++ b/src/components/views/elements/TintableSvg.js
@@ -18,7 +18,9 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import Tinter from "../../../Tinter";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.elements.TintableSvg")
 class TintableSvg extends React.Component {
     static propTypes = {
         src: PropTypes.string.isRequired,
diff --git a/src/components/views/elements/Tooltip.tsx b/src/components/views/elements/Tooltip.tsx
index 03b9eb08d0..b2dd00de18 100644
--- a/src/components/views/elements/Tooltip.tsx
+++ b/src/components/views/elements/Tooltip.tsx
@@ -21,6 +21,7 @@ limitations under the License.
 import React, {Component, CSSProperties} from 'react';
 import ReactDOM from 'react-dom';
 import classNames from 'classnames';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 const MIN_TOOLTIP_HEIGHT = 25;
 
@@ -39,6 +40,7 @@ interface IProps {
         yOffset?: number;
 }
 
+@replaceableComponent("views.elements.Tooltip")
 export default class Tooltip extends React.Component<IProps> {
     private tooltipContainer: HTMLElement;
     private tooltip: void | Element | Component<Element, any, any>;
diff --git a/src/components/views/elements/TooltipButton.js b/src/components/views/elements/TooltipButton.js
index 240d763bdc..c5ebb3b1aa 100644
--- a/src/components/views/elements/TooltipButton.js
+++ b/src/components/views/elements/TooltipButton.js
@@ -17,7 +17,9 @@ limitations under the License.
 
 import React from 'react';
 import * as sdk from '../../../index';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.elements.TooltipButton")
 export default class TooltipButton extends React.Component {
     state = {
         hover: false,
diff --git a/src/components/views/elements/TruncatedList.js b/src/components/views/elements/TruncatedList.js
index 81eb057e36..0509775545 100644
--- a/src/components/views/elements/TruncatedList.js
+++ b/src/components/views/elements/TruncatedList.js
@@ -18,7 +18,9 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.elements.TruncatedList")
 export default class TruncatedList extends React.Component {
     static propTypes = {
         // The number of elements to show before truncating. If negative, no truncation is done.
diff --git a/src/components/views/elements/UserTagTile.tsx b/src/components/views/elements/UserTagTile.tsx
index e7c74bb10e..d3e07a0a34 100644
--- a/src/components/views/elements/UserTagTile.tsx
+++ b/src/components/views/elements/UserTagTile.tsx
@@ -21,6 +21,7 @@ import GroupFilterOrderStore from "../../../stores/GroupFilterOrderStore";
 import AccessibleTooltipButton from "./AccessibleTooltipButton";
 import classNames from "classnames";
 import { _t } from "../../../languageHandler";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 interface IProps {
 }
@@ -29,6 +30,7 @@ interface IState {
     selected: boolean;
 }
 
+@replaceableComponent("views.elements.UserTagTile")
 export default class UserTagTile extends React.PureComponent<IProps, IState> {
     private tagStoreRef: fbEmitter.EventSubscription;
 

From fc5b1ed9d686f2d297f44872eb47812a5648dea3 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 8 Mar 2021 20:04:46 -0700
Subject: [PATCH 223/420] Batch of views getting replaceableComponent
 decorators

---
 src/components/views/emojipicker/Category.tsx               | 2 ++
 src/components/views/emojipicker/Emoji.tsx                  | 2 ++
 src/components/views/emojipicker/EmojiPicker.tsx            | 2 ++
 src/components/views/emojipicker/Header.tsx                 | 2 ++
 src/components/views/emojipicker/Preview.tsx                | 2 ++
 src/components/views/emojipicker/QuickReactions.tsx         | 2 ++
 src/components/views/emojipicker/ReactionPicker.tsx         | 2 ++
 src/components/views/emojipicker/Search.tsx                 | 2 ++
 src/components/views/groups/GroupInviteTile.js              | 2 ++
 src/components/views/groups/GroupMemberList.js              | 2 ++
 src/components/views/groups/GroupMemberTile.js              | 2 ++
 src/components/views/groups/GroupPublicityToggle.js         | 2 ++
 src/components/views/groups/GroupRoomInfo.js                | 2 ++
 src/components/views/groups/GroupRoomList.js                | 2 ++
 src/components/views/groups/GroupRoomTile.js                | 2 ++
 src/components/views/groups/GroupTile.js                    | 2 ++
 src/components/views/groups/GroupUserSettings.js            | 2 ++
 src/components/views/messages/DateSeparator.js              | 2 ++
 src/components/views/messages/EditHistoryMessage.js         | 2 ++
 src/components/views/messages/MAudioBody.js                 | 2 ++
 src/components/views/messages/MFileBody.js                  | 2 ++
 src/components/views/messages/MImageBody.js                 | 2 ++
 src/components/views/messages/MJitsiWidgetEvent.tsx         | 2 ++
 src/components/views/messages/MKeyVerificationConclusion.js | 2 ++
 src/components/views/messages/MKeyVerificationRequest.js    | 2 ++
 src/components/views/messages/MStickerBody.js               | 2 ++
 src/components/views/messages/MVideoBody.tsx                | 2 ++
 src/components/views/messages/MessageActionBar.js           | 2 ++
 src/components/views/messages/MessageEvent.js               | 2 ++
 src/components/views/messages/MessageTimestamp.js           | 2 ++
 src/components/views/messages/MjolnirBody.js                | 2 ++
 src/components/views/messages/ReactionsRow.js               | 2 ++
 src/components/views/messages/ReactionsRowButton.js         | 2 ++
 src/components/views/messages/ReactionsRowButtonTooltip.js  | 2 ++
 src/components/views/messages/RoomAvatarEvent.js            | 2 ++
 src/components/views/messages/RoomCreate.js                 | 2 ++
 src/components/views/messages/SenderProfile.js              | 2 ++
 src/components/views/messages/TextualBody.js                | 2 ++
 src/components/views/messages/TextualEvent.js               | 2 ++
 src/components/views/messages/TileErrorBoundary.js          | 2 ++
 src/components/views/messages/ViewSourceEvent.js            | 2 ++
 41 files changed, 82 insertions(+)

diff --git a/src/components/views/emojipicker/Category.tsx b/src/components/views/emojipicker/Category.tsx
index c4feaac8ae..4c7852def3 100644
--- a/src/components/views/emojipicker/Category.tsx
+++ b/src/components/views/emojipicker/Category.tsx
@@ -21,6 +21,7 @@ import { CATEGORY_HEADER_HEIGHT, EMOJI_HEIGHT, EMOJIS_PER_ROW } from "./EmojiPic
 import LazyRenderList from "../elements/LazyRenderList";
 import {DATA_BY_CATEGORY, IEmoji} from "../../../emoji";
 import Emoji from './Emoji';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 const OVERFLOW_ROWS = 3;
 
@@ -47,6 +48,7 @@ interface IProps {
     onMouseLeave(emoji: IEmoji): void;
 }
 
+@replaceableComponent("views.emojipicker.Category")
 class Category extends React.PureComponent<IProps> {
     private renderEmojiRow = (rowIndex: number) => {
         const { onClick, onMouseEnter, onMouseLeave, selectedEmojis, emojis } = this.props;
diff --git a/src/components/views/emojipicker/Emoji.tsx b/src/components/views/emojipicker/Emoji.tsx
index 5d715fb935..5d7665ce98 100644
--- a/src/components/views/emojipicker/Emoji.tsx
+++ b/src/components/views/emojipicker/Emoji.tsx
@@ -19,6 +19,7 @@ import React from 'react';
 
 import {MenuItem} from "../../structures/ContextMenu";
 import {IEmoji} from "../../../emoji";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 interface IProps {
     emoji: IEmoji;
@@ -28,6 +29,7 @@ interface IProps {
     onMouseLeave(emoji: IEmoji): void;
 }
 
+@replaceableComponent("views.emojipicker.Emoji")
 class Emoji extends React.PureComponent<IProps> {
     render() {
         const { onClick, onMouseEnter, onMouseLeave, emoji, selectedEmojis } = this.props;
diff --git a/src/components/views/emojipicker/EmojiPicker.tsx b/src/components/views/emojipicker/EmojiPicker.tsx
index bf0481c51c..6d7b90c8a6 100644
--- a/src/components/views/emojipicker/EmojiPicker.tsx
+++ b/src/components/views/emojipicker/EmojiPicker.tsx
@@ -26,6 +26,7 @@ import Search from "./Search";
 import Preview from "./Preview";
 import QuickReactions from "./QuickReactions";
 import Category, {ICategory, CategoryKey} from "./Category";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 export const CATEGORY_HEADER_HEIGHT = 22;
 export const EMOJI_HEIGHT = 37;
@@ -47,6 +48,7 @@ interface IState {
     viewportHeight: number;
 }
 
+@replaceableComponent("views.emojipicker.EmojiPicker")
 class EmojiPicker extends React.Component<IProps, IState> {
     private readonly recentlyUsed: IEmoji[];
     private readonly memoizedDataByCategory: Record<CategoryKey, IEmoji[]>;
diff --git a/src/components/views/emojipicker/Header.tsx b/src/components/views/emojipicker/Header.tsx
index 9a93722483..693f86ad73 100644
--- a/src/components/views/emojipicker/Header.tsx
+++ b/src/components/views/emojipicker/Header.tsx
@@ -21,12 +21,14 @@ import classNames from "classnames";
 import {_t} from "../../../languageHandler";
 import {Key} from "../../../Keyboard";
 import {CategoryKey, ICategory} from "./Category";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 interface IProps {
     categories: ICategory[];
     onAnchorClick(id: CategoryKey): void
 }
 
+@replaceableComponent("views.emojipicker.Header")
 class Header extends React.PureComponent<IProps> {
     private findNearestEnabled(index: number, delta: number) {
         index += this.props.categories.length;
diff --git a/src/components/views/emojipicker/Preview.tsx b/src/components/views/emojipicker/Preview.tsx
index 69bfdf4d1c..e0952ec73e 100644
--- a/src/components/views/emojipicker/Preview.tsx
+++ b/src/components/views/emojipicker/Preview.tsx
@@ -18,11 +18,13 @@ limitations under the License.
 import React from 'react';
 
 import {IEmoji} from "../../../emoji";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 interface IProps {
     emoji: IEmoji;
 }
 
+@replaceableComponent("views.emojipicker.Preview")
 class Preview extends React.PureComponent<IProps> {
     render() {
         const {
diff --git a/src/components/views/emojipicker/QuickReactions.tsx b/src/components/views/emojipicker/QuickReactions.tsx
index 0477ecfb93..a250aca458 100644
--- a/src/components/views/emojipicker/QuickReactions.tsx
+++ b/src/components/views/emojipicker/QuickReactions.tsx
@@ -20,6 +20,7 @@ import React from 'react';
 import { _t } from '../../../languageHandler';
 import {getEmojiFromUnicode, IEmoji} from "../../../emoji";
 import Emoji from "./Emoji";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 // We use the variation-selector Heart in Quick Reactions for some reason
 const QUICK_REACTIONS = ["👍", "👎", "😄", "🎉", "😕", "❤️", "🚀", "👀"].map(emoji => {
@@ -39,6 +40,7 @@ interface IState {
     hover?: IEmoji;
 }
 
+@replaceableComponent("views.emojipicker.QuickReactions")
 class QuickReactions extends React.Component<IProps, IState> {
     constructor(props) {
         super(props);
diff --git a/src/components/views/emojipicker/ReactionPicker.tsx b/src/components/views/emojipicker/ReactionPicker.tsx
index dbef0eadbe..e86d183aba 100644
--- a/src/components/views/emojipicker/ReactionPicker.tsx
+++ b/src/components/views/emojipicker/ReactionPicker.tsx
@@ -21,6 +21,7 @@ import {MatrixEvent} from "matrix-js-sdk/src/models/event";
 import EmojiPicker from "./EmojiPicker";
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import dis from "../../../dispatcher/dispatcher";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 interface IProps {
     mxEvent: MatrixEvent;
@@ -32,6 +33,7 @@ interface IState {
     selectedEmojis: Set<string>;
 }
 
+@replaceableComponent("views.emojipicker.ReactionPicker")
 class ReactionPicker extends React.Component<IProps, IState> {
     constructor(props) {
         super(props);
diff --git a/src/components/views/emojipicker/Search.tsx b/src/components/views/emojipicker/Search.tsx
index fe1fecec7b..abe3e026be 100644
--- a/src/components/views/emojipicker/Search.tsx
+++ b/src/components/views/emojipicker/Search.tsx
@@ -19,6 +19,7 @@ import React from 'react';
 
 import { _t } from '../../../languageHandler';
 import {Key} from "../../../Keyboard";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 interface IProps {
     query: string;
@@ -26,6 +27,7 @@ interface IProps {
     onEnter(): void;
 }
 
+@replaceableComponent("views.emojipicker.Search")
 class Search extends React.PureComponent<IProps> {
     private inputRef = React.createRef<HTMLInputElement>();
 
diff --git a/src/components/views/groups/GroupInviteTile.js b/src/components/views/groups/GroupInviteTile.js
index 0c09b6ed05..dc48c01acb 100644
--- a/src/components/views/groups/GroupInviteTile.js
+++ b/src/components/views/groups/GroupInviteTile.js
@@ -26,8 +26,10 @@ import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import {ContextMenu, ContextMenuButton, toRightOf} from "../../structures/ContextMenu";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import {RovingTabIndexWrapper} from "../../../accessibility/RovingTabIndex";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 // XXX this class copies a lot from RoomTile.js
+@replaceableComponent("views.groups.GroupInviteTile")
 export default class GroupInviteTile extends React.Component {
     static propTypes: {
         group: PropTypes.object.isRequired,
diff --git a/src/components/views/groups/GroupMemberList.js b/src/components/views/groups/GroupMemberList.js
index 600a466601..d5b3f9aec7 100644
--- a/src/components/views/groups/GroupMemberList.js
+++ b/src/components/views/groups/GroupMemberList.js
@@ -26,9 +26,11 @@ import AccessibleButton from '../elements/AccessibleButton';
 import {RightPanelPhases} from "../../../stores/RightPanelStorePhases";
 import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
 import {Action} from "../../../dispatcher/actions";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 const INITIAL_LOAD_NUM_MEMBERS = 30;
 
+@replaceableComponent("views.groups.GroupMemberList")
 export default class GroupMemberList extends React.Component {
     static propTypes = {
         groupId: PropTypes.string.isRequired,
diff --git a/src/components/views/groups/GroupMemberTile.js b/src/components/views/groups/GroupMemberTile.js
index 13617cf681..e8285803b0 100644
--- a/src/components/views/groups/GroupMemberTile.js
+++ b/src/components/views/groups/GroupMemberTile.js
@@ -22,7 +22,9 @@ import * as sdk from '../../../index';
 import dis from '../../../dispatcher/dispatcher';
 import { GroupMemberType } from '../../../groups';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.groups.GroupMemberTile")
 export default class GroupMemberTile extends React.Component {
     static propTypes = {
         groupId: PropTypes.string.isRequired,
diff --git a/src/components/views/groups/GroupPublicityToggle.js b/src/components/views/groups/GroupPublicityToggle.js
index d42059551e..5399125d9f 100644
--- a/src/components/views/groups/GroupPublicityToggle.js
+++ b/src/components/views/groups/GroupPublicityToggle.js
@@ -19,7 +19,9 @@ import PropTypes from 'prop-types';
 import * as sdk from '../../../index';
 import GroupStore from '../../../stores/GroupStore';
 import ToggleSwitch from "../elements/ToggleSwitch";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.groups.GroupPublicityTile")
 export default class GroupPublicityToggle extends React.Component {
     static propTypes = {
         groupId: PropTypes.string.isRequired,
diff --git a/src/components/views/groups/GroupRoomInfo.js b/src/components/views/groups/GroupRoomInfo.js
index 50bbd26029..227a17e995 100644
--- a/src/components/views/groups/GroupRoomInfo.js
+++ b/src/components/views/groups/GroupRoomInfo.js
@@ -24,7 +24,9 @@ import { _t } from '../../../languageHandler';
 import GroupStore from '../../../stores/GroupStore';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.groups.GroupRoomInfo")
 export default class GroupRoomInfo extends React.Component {
     static contextType = MatrixClientContext;
 
diff --git a/src/components/views/groups/GroupRoomList.js b/src/components/views/groups/GroupRoomList.js
index 9bb46db47c..f8a90f9222 100644
--- a/src/components/views/groups/GroupRoomList.js
+++ b/src/components/views/groups/GroupRoomList.js
@@ -21,9 +21,11 @@ import PropTypes from 'prop-types';
 import { showGroupAddRoomDialog } from '../../../GroupAddressPicker';
 import AccessibleButton from '../elements/AccessibleButton';
 import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 const INITIAL_LOAD_NUM_ROOMS = 30;
 
+@replaceableComponent("views.groups.GroupRoomList")
 export default class GroupRoomList extends React.Component {
     static propTypes = {
         groupId: PropTypes.string.isRequired,
diff --git a/src/components/views/groups/GroupRoomTile.js b/src/components/views/groups/GroupRoomTile.js
index 85aa56d055..8b25437f71 100644
--- a/src/components/views/groups/GroupRoomTile.js
+++ b/src/components/views/groups/GroupRoomTile.js
@@ -20,7 +20,9 @@ import * as sdk from '../../../index';
 import dis from '../../../dispatcher/dispatcher';
 import { GroupRoomType } from '../../../groups';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.groups.GroupRoomTile")
 class GroupRoomTile extends React.Component {
     static propTypes = {
         groupId: PropTypes.string.isRequired,
diff --git a/src/components/views/groups/GroupTile.js b/src/components/views/groups/GroupTile.js
index dcc749b01f..bb1714c9f2 100644
--- a/src/components/views/groups/GroupTile.js
+++ b/src/components/views/groups/GroupTile.js
@@ -21,9 +21,11 @@ import * as sdk from '../../../index';
 import dis from '../../../dispatcher/dispatcher';
 import FlairStore from '../../../stores/FlairStore';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 function nop() {}
 
+@replaceableComponent("views.groups.GroupTile")
 class GroupTile extends React.Component {
     static propTypes = {
         groupId: PropTypes.string.isRequired,
diff --git a/src/components/views/groups/GroupUserSettings.js b/src/components/views/groups/GroupUserSettings.js
index 9209106c8f..5b537d7377 100644
--- a/src/components/views/groups/GroupUserSettings.js
+++ b/src/components/views/groups/GroupUserSettings.js
@@ -18,7 +18,9 @@ import React from 'react';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.groups.GroupUserSettings")
 export default class GroupUserSettings extends React.Component {
     static contextType = MatrixClientContext;
 
diff --git a/src/components/views/messages/DateSeparator.js b/src/components/views/messages/DateSeparator.js
index ef4b5d16d1..82ce8dc4ae 100644
--- a/src/components/views/messages/DateSeparator.js
+++ b/src/components/views/messages/DateSeparator.js
@@ -19,6 +19,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
 import {formatFullDateNoTime} from '../../../DateUtils';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 function getdaysArray() {
     return [
@@ -32,6 +33,7 @@ function getdaysArray() {
     ];
 }
 
+@replaceableComponent("views.messages.DateSeparator")
 export default class DateSeparator extends React.Component {
     static propTypes = {
         ts: PropTypes.number.isRequired,
diff --git a/src/components/views/messages/EditHistoryMessage.js b/src/components/views/messages/EditHistoryMessage.js
index 0967be937a..7f100fbb92 100644
--- a/src/components/views/messages/EditHistoryMessage.js
+++ b/src/components/views/messages/EditHistoryMessage.js
@@ -27,12 +27,14 @@ import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import Modal from '../../../Modal';
 import classNames from 'classnames';
 import RedactedBody from "./RedactedBody";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 function getReplacedContent(event) {
     const originalContent = event.getOriginalContent();
     return originalContent["m.new_content"] || originalContent;
 }
 
+@replaceableComponent("views.messages.EditHistoryMessage")
 export default class EditHistoryMessage extends React.PureComponent {
     static propTypes = {
         // the message event being edited
diff --git a/src/components/views/messages/MAudioBody.js b/src/components/views/messages/MAudioBody.js
index 587dee4513..59a10e17f3 100644
--- a/src/components/views/messages/MAudioBody.js
+++ b/src/components/views/messages/MAudioBody.js
@@ -23,7 +23,9 @@ import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import { decryptFile } from '../../../utils/DecryptFile';
 import { _t } from '../../../languageHandler';
 import InlineSpinner from '../elements/InlineSpinner';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.messages.MAudioBody")
 export default class MAudioBody extends React.Component {
     constructor(props) {
         super(props);
diff --git a/src/components/views/messages/MFileBody.js b/src/components/views/messages/MFileBody.js
index 676f0b7986..e9893f99b6 100644
--- a/src/components/views/messages/MFileBody.js
+++ b/src/components/views/messages/MFileBody.js
@@ -26,6 +26,7 @@ import Tinter from '../../../Tinter';
 import request from 'browser-request';
 import Modal from '../../../Modal';
 import AccessibleButton from "../elements/AccessibleButton";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 
 // A cached tinted copy of require("../../../../res/img/download.svg")
@@ -116,6 +117,7 @@ function computedStyle(element) {
     return cssText;
 }
 
+@replaceableComponent("views.messages.MFileBody")
 export default class MFileBody extends React.Component {
     static propTypes = {
         /* the MatrixEvent to show */
diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js
index 771d12accd..59c5b4e66b 100644
--- a/src/components/views/messages/MImageBody.js
+++ b/src/components/views/messages/MImageBody.js
@@ -27,7 +27,9 @@ import { _t } from '../../../languageHandler';
 import SettingsStore from "../../../settings/SettingsStore";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import InlineSpinner from '../elements/InlineSpinner';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.messages.MImageBody")
 export default class MImageBody extends React.Component {
     static propTypes = {
         /* the MatrixEvent to show */
diff --git a/src/components/views/messages/MJitsiWidgetEvent.tsx b/src/components/views/messages/MJitsiWidgetEvent.tsx
index 6031ede8fa..626efe1f36 100644
--- a/src/components/views/messages/MJitsiWidgetEvent.tsx
+++ b/src/components/views/messages/MJitsiWidgetEvent.tsx
@@ -21,11 +21,13 @@ import WidgetStore from "../../../stores/WidgetStore";
 import EventTileBubble from "./EventTileBubble";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import { Container, WidgetLayoutStore } from "../../../stores/widgets/WidgetLayoutStore";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 interface IProps {
     mxEvent: MatrixEvent;
 }
 
+@replaceableComponent("views.messages.MJitsiWidgetEvent")
 export default class MJitsiWidgetEvent extends React.PureComponent<IProps> {
     constructor(props) {
         super(props);
diff --git a/src/components/views/messages/MKeyVerificationConclusion.js b/src/components/views/messages/MKeyVerificationConclusion.js
index 880299d29d..75d20131c0 100644
--- a/src/components/views/messages/MKeyVerificationConclusion.js
+++ b/src/components/views/messages/MKeyVerificationConclusion.js
@@ -22,7 +22,9 @@ import { _t } from '../../../languageHandler';
 import {getNameForEventRoom, userLabelForEventRoom}
     from '../../../utils/KeyVerificationStateObserver';
 import EventTileBubble from "./EventTileBubble";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.messages.MKeyVerificationConclusion")
 export default class MKeyVerificationConclusion extends React.Component {
     constructor(props) {
         super(props);
diff --git a/src/components/views/messages/MKeyVerificationRequest.js b/src/components/views/messages/MKeyVerificationRequest.js
index d9594091c5..988606a766 100644
--- a/src/components/views/messages/MKeyVerificationRequest.js
+++ b/src/components/views/messages/MKeyVerificationRequest.js
@@ -25,7 +25,9 @@ import dis from "../../../dispatcher/dispatcher";
 import {RightPanelPhases} from "../../../stores/RightPanelStorePhases";
 import {Action} from "../../../dispatcher/actions";
 import EventTileBubble from "./EventTileBubble";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.messages.MKeyVerificationRequest")
 export default class MKeyVerificationRequest extends React.Component {
     constructor(props) {
         super(props);
diff --git a/src/components/views/messages/MStickerBody.js b/src/components/views/messages/MStickerBody.js
index 9839080661..54eb7649b4 100644
--- a/src/components/views/messages/MStickerBody.js
+++ b/src/components/views/messages/MStickerBody.js
@@ -17,7 +17,9 @@ limitations under the License.
 import React from 'react';
 import MImageBody from './MImageBody';
 import * as sdk from '../../../index';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.messages.MStickerBody")
 export default class MStickerBody extends MImageBody {
     // Mostly empty to prevent default behaviour of MImageBody
     onClick(ev) {
diff --git a/src/components/views/messages/MVideoBody.tsx b/src/components/views/messages/MVideoBody.tsx
index ce4a4eda76..89985dee7d 100644
--- a/src/components/views/messages/MVideoBody.tsx
+++ b/src/components/views/messages/MVideoBody.tsx
@@ -22,6 +22,7 @@ import { decryptFile } from '../../../utils/DecryptFile';
 import { _t } from '../../../languageHandler';
 import SettingsStore from "../../../settings/SettingsStore";
 import InlineSpinner from '../elements/InlineSpinner';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 interface IProps {
     /* the MatrixEvent to show */
@@ -38,6 +39,7 @@ interface IState {
     fetchingData: boolean,
 }
 
+@replaceableComponent("views.messages.MVideoBody")
 export default class MVideoBody extends React.PureComponent<IProps, IState> {
     private videoRef = React.createRef<HTMLVideoElement>();
 
diff --git a/src/components/views/messages/MessageActionBar.js b/src/components/views/messages/MessageActionBar.js
index c94f296eac..c33debe3f5 100644
--- a/src/components/views/messages/MessageActionBar.js
+++ b/src/components/views/messages/MessageActionBar.js
@@ -28,6 +28,7 @@ import { isContentActionable, canEditContent } from '../../../utils/EventUtils';
 import RoomContext from "../../../contexts/RoomContext";
 import Toolbar from "../../../accessibility/Toolbar";
 import {RovingAccessibleTooltipButton, useRovingTabIndex} from "../../../accessibility/RovingTabIndex";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 const OptionsButton = ({mxEvent, getTile, getReplyThread, permalinkCreator, onFocusChange}) => {
     const [menuDisplayed, button, openMenu, closeMenu] = useContextMenu();
@@ -101,6 +102,7 @@ const ReactButton = ({mxEvent, reactions, onFocusChange}) => {
     </React.Fragment>;
 };
 
+@replaceableComponent("views.messages.MessageActionBar")
 export default class MessageActionBar extends React.PureComponent {
     static propTypes = {
         mxEvent: PropTypes.object.isRequired,
diff --git a/src/components/views/messages/MessageEvent.js b/src/components/views/messages/MessageEvent.js
index f93813fe79..866e0f521d 100644
--- a/src/components/views/messages/MessageEvent.js
+++ b/src/components/views/messages/MessageEvent.js
@@ -21,7 +21,9 @@ import SettingsStore from "../../../settings/SettingsStore";
 import {Mjolnir} from "../../../mjolnir/Mjolnir";
 import RedactedBody from "./RedactedBody";
 import UnknownBody from "./UnknownBody";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.messages.MessageEvent")
 export default class MessageEvent extends React.Component {
     static propTypes = {
         /* the MatrixEvent to show */
diff --git a/src/components/views/messages/MessageTimestamp.js b/src/components/views/messages/MessageTimestamp.js
index 199a6f47ce..c9bdb8937e 100644
--- a/src/components/views/messages/MessageTimestamp.js
+++ b/src/components/views/messages/MessageTimestamp.js
@@ -18,7 +18,9 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import {formatFullDate, formatTime} from '../../../DateUtils';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.messages.MessageTimestamp")
 export default class MessageTimestamp extends React.Component {
     static propTypes = {
         ts: PropTypes.number.isRequired,
diff --git a/src/components/views/messages/MjolnirBody.js b/src/components/views/messages/MjolnirBody.js
index baaee91657..4368fd936c 100644
--- a/src/components/views/messages/MjolnirBody.js
+++ b/src/components/views/messages/MjolnirBody.js
@@ -17,7 +17,9 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import {_t} from '../../../languageHandler';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.messages.MjolnirBody")
 export default class MjolnirBody extends React.Component {
     static propTypes = {
         mxEvent: PropTypes.object.isRequired,
diff --git a/src/components/views/messages/ReactionsRow.js b/src/components/views/messages/ReactionsRow.js
index 3451cdbb2d..d5c8ea2ac9 100644
--- a/src/components/views/messages/ReactionsRow.js
+++ b/src/components/views/messages/ReactionsRow.js
@@ -21,10 +21,12 @@ import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import { isContentActionable } from '../../../utils/EventUtils';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 // The maximum number of reactions to initially show on a message.
 const MAX_ITEMS_WHEN_LIMITED = 8;
 
+@replaceableComponent("views.messages.ReactionsRow")
 export default class ReactionsRow extends React.PureComponent {
     static propTypes = {
         // The event we're displaying reactions for
diff --git a/src/components/views/messages/ReactionsRowButton.js b/src/components/views/messages/ReactionsRowButton.js
index bb8d9a3b6e..06421c02a2 100644
--- a/src/components/views/messages/ReactionsRowButton.js
+++ b/src/components/views/messages/ReactionsRowButton.js
@@ -23,7 +23,9 @@ import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import { formatCommaSeparatedList } from '../../../utils/FormattingUtils';
 import dis from "../../../dispatcher/dispatcher";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.messages.ReactionsRowButton")
 export default class ReactionsRowButton extends React.PureComponent {
     static propTypes = {
         // The event we're displaying reactions for
diff --git a/src/components/views/messages/ReactionsRowButtonTooltip.js b/src/components/views/messages/ReactionsRowButtonTooltip.js
index 2b90175722..5ecdfe311d 100644
--- a/src/components/views/messages/ReactionsRowButtonTooltip.js
+++ b/src/components/views/messages/ReactionsRowButtonTooltip.js
@@ -22,7 +22,9 @@ import * as sdk from '../../../index';
 import { unicodeToShortcode } from '../../../HtmlUtils';
 import { _t } from '../../../languageHandler';
 import { formatCommaSeparatedList } from '../../../utils/FormattingUtils';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.messages.ReactionsRowButtonTooltip")
 export default class ReactionsRowButtonTooltip extends React.PureComponent {
     static propTypes = {
         // The event we're displaying reactions for
diff --git a/src/components/views/messages/RoomAvatarEvent.js b/src/components/views/messages/RoomAvatarEvent.js
index f526d080cc..ba860216f0 100644
--- a/src/components/views/messages/RoomAvatarEvent.js
+++ b/src/components/views/messages/RoomAvatarEvent.js
@@ -23,7 +23,9 @@ import { _t } from '../../../languageHandler';
 import * as sdk from '../../../index';
 import Modal from '../../../Modal';
 import AccessibleButton from '../elements/AccessibleButton';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.messages.RoomAvatarEvent")
 export default class RoomAvatarEvent extends React.Component {
     static propTypes = {
         /* the MatrixEvent to show */
diff --git a/src/components/views/messages/RoomCreate.js b/src/components/views/messages/RoomCreate.js
index 479592aa42..3e02884c02 100644
--- a/src/components/views/messages/RoomCreate.js
+++ b/src/components/views/messages/RoomCreate.js
@@ -23,7 +23,9 @@ import { RoomPermalinkCreator } from '../../../utils/permalinks/Permalinks';
 import { _t } from '../../../languageHandler';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import EventTileBubble from "./EventTileBubble";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.messages.RoomCreate")
 export default class RoomCreate extends React.Component {
     static propTypes = {
         /* the MatrixEvent to show */
diff --git a/src/components/views/messages/SenderProfile.js b/src/components/views/messages/SenderProfile.js
index d2db05252c..bd10526799 100644
--- a/src/components/views/messages/SenderProfile.js
+++ b/src/components/views/messages/SenderProfile.js
@@ -20,7 +20,9 @@ import Flair from '../elements/Flair.js';
 import FlairStore from '../../../stores/FlairStore';
 import {getUserNameColorClass} from '../../../utils/FormattingUtils';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.messages.SenderProfile")
 export default class SenderProfile extends React.Component {
     static propTypes = {
         mxEvent: PropTypes.object.isRequired, // event whose sender we're showing
diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js
index 04db7bd725..b0eb6f2f35 100644
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@@ -35,7 +35,9 @@ import {isPermalinkHost} from "../../../utils/permalinks/Permalinks";
 import {toRightOf} from "../../structures/ContextMenu";
 import {copyPlaintext} from "../../../utils/strings";
 import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.messages.TextualBody")
 export default class TextualBody extends React.Component {
     static propTypes = {
         /* the MatrixEvent to show */
diff --git a/src/components/views/messages/TextualEvent.js b/src/components/views/messages/TextualEvent.js
index 99e94147f7..a020cc6c52 100644
--- a/src/components/views/messages/TextualEvent.js
+++ b/src/components/views/messages/TextualEvent.js
@@ -18,7 +18,9 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import * as TextForEvent from "../../../TextForEvent";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.messages.TextualEvent")
 export default class TextualEvent extends React.Component {
     static propTypes = {
         /* the MatrixEvent to show */
diff --git a/src/components/views/messages/TileErrorBoundary.js b/src/components/views/messages/TileErrorBoundary.js
index 9b67e32548..0e9a7b6128 100644
--- a/src/components/views/messages/TileErrorBoundary.js
+++ b/src/components/views/messages/TileErrorBoundary.js
@@ -20,7 +20,9 @@ import { _t } from '../../../languageHandler';
 import * as sdk from '../../../index';
 import Modal from '../../../Modal';
 import SdkConfig from "../../../SdkConfig";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.messages.TileErrorBoundary")
 export default class TileErrorBoundary extends React.Component {
     constructor(props) {
         super(props);
diff --git a/src/components/views/messages/ViewSourceEvent.js b/src/components/views/messages/ViewSourceEvent.js
index 9064fc3b68..adc7a248cd 100644
--- a/src/components/views/messages/ViewSourceEvent.js
+++ b/src/components/views/messages/ViewSourceEvent.js
@@ -17,7 +17,9 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.messages.ViewSourceEvent")
 export default class ViewSourceEvent extends React.PureComponent {
     static propTypes = {
         /* the MatrixEvent to show */

From c5935dbc6169f44c32becb8163aff99c42bbae0f Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 8 Mar 2021 20:12:00 -0700
Subject: [PATCH 224/420] Batch of views getting replaceableComponent
 decorators

---
 src/components/views/right_panel/GroupHeaderButtons.tsx    | 2 ++
 src/components/views/right_panel/HeaderButton.tsx          | 2 ++
 src/components/views/right_panel/HeaderButtons.tsx         | 2 ++
 src/components/views/right_panel/RoomHeaderButtons.tsx     | 2 ++
 src/components/views/right_panel/VerificationPanel.tsx     | 2 ++
 src/components/views/room_settings/AliasSettings.js        | 2 ++
 src/components/views/room_settings/RelatedGroupSettings.js | 2 ++
 src/components/views/room_settings/RoomProfileSettings.js  | 2 ++
 src/components/views/room_settings/UrlPreviewSettings.js   | 3 ++-
 src/components/views/rooms/AppsDrawer.js                   | 2 ++
 src/components/views/rooms/Autocomplete.tsx                | 2 ++
 src/components/views/rooms/AuxPanel.tsx                    | 2 ++
 src/components/views/rooms/BasicMessageComposer.tsx        | 2 ++
 src/components/views/rooms/EditMessageComposer.js          | 2 ++
 src/components/views/rooms/EntityTile.js                   | 2 ++
 src/components/views/rooms/EventTile.js                    | 2 ++
 src/components/views/rooms/ForwardMessage.js               | 3 ++-
 src/components/views/rooms/LinkPreviewWidget.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/MessageComposerFormatBar.js     | 2 ++
 src/components/views/rooms/NotificationBadge.tsx           | 2 ++
 src/components/views/rooms/PinnedEventTile.js              | 2 ++
 src/components/views/rooms/PinnedEventsPanel.js            | 2 ++
 src/components/views/rooms/PresenceLabel.js                | 3 ++-
 src/components/views/rooms/ReadReceiptMarker.js            | 2 ++
 src/components/views/rooms/ReplyPreview.js                 | 2 ++
 src/components/views/rooms/RoomBreadcrumbs.tsx             | 2 ++
 src/components/views/rooms/RoomDetailList.js               | 2 ++
 src/components/views/rooms/RoomDetailRow.js                | 2 ++
 src/components/views/rooms/RoomHeader.js                   | 2 ++
 src/components/views/rooms/RoomList.tsx                    | 2 ++
 src/components/views/rooms/RoomPreviewBar.js               | 2 ++
 src/components/views/rooms/RoomSublist.tsx                 | 2 ++
 src/components/views/rooms/RoomTile.tsx                    | 2 ++
 src/components/views/rooms/RoomUpgradeWarningBar.js        | 2 ++
 src/components/views/rooms/SearchBar.js                    | 2 ++
 src/components/views/rooms/SearchResultTile.js             | 2 ++
 src/components/views/rooms/SendMessageComposer.js          | 2 ++
 src/components/views/rooms/SimpleRoomHeader.js             | 2 ++
 src/components/views/rooms/Stickerpicker.js                | 2 ++
 src/components/views/rooms/TemporaryTile.tsx               | 2 ++
 src/components/views/rooms/ThirdPartyMemberInfo.js         | 2 ++
 src/components/views/rooms/TopUnreadMessagesBar.js         | 2 ++
 src/components/views/rooms/WhoIsTypingTile.js              | 2 ++
 46 files changed, 92 insertions(+), 3 deletions(-)

diff --git a/src/components/views/right_panel/GroupHeaderButtons.tsx b/src/components/views/right_panel/GroupHeaderButtons.tsx
index dd4a82e645..f006975b08 100644
--- a/src/components/views/right_panel/GroupHeaderButtons.tsx
+++ b/src/components/views/right_panel/GroupHeaderButtons.tsx
@@ -26,6 +26,7 @@ import {RightPanelPhases} from "../../../stores/RightPanelStorePhases";
 import {Action} from "../../../dispatcher/actions";
 import {ActionPayload} from "../../../dispatcher/payloads";
 import {ViewUserPayload} from "../../../dispatcher/payloads/ViewUserPayload";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 const GROUP_PHASES = [
     RightPanelPhases.GroupMemberInfo,
@@ -38,6 +39,7 @@ const ROOM_PHASES = [
 
 interface IProps {}
 
+@replaceableComponent("views.right_panel.GroupHeaderButtons")
 export default class GroupHeaderButtons extends HeaderButtons {
     constructor(props: IProps) {
         super(props, HeaderKind.Group);
diff --git a/src/components/views/right_panel/HeaderButton.tsx b/src/components/views/right_panel/HeaderButton.tsx
index 7f682e2d89..2bc360e380 100644
--- a/src/components/views/right_panel/HeaderButton.tsx
+++ b/src/components/views/right_panel/HeaderButton.tsx
@@ -22,6 +22,7 @@ import React from 'react';
 import classNames from 'classnames';
 import Analytics from '../../../Analytics';
 import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 interface IProps {
     // Whether this button is highlighted
@@ -41,6 +42,7 @@ interface IProps {
 
 // TODO: replace this, the composer buttons and the right panel buttons with a unified
 // representation
+@replaceableComponent("views.right_panel.HeaderButton")
 export default class HeaderButton extends React.Component<IProps> {
     constructor(props: IProps) {
         super(props);
diff --git a/src/components/views/right_panel/HeaderButtons.tsx b/src/components/views/right_panel/HeaderButtons.tsx
index 543c7c067f..2144292679 100644
--- a/src/components/views/right_panel/HeaderButtons.tsx
+++ b/src/components/views/right_panel/HeaderButtons.tsx
@@ -28,6 +28,7 @@ import {
     SetRightPanelPhaseRefireParams,
 } from '../../../dispatcher/payloads/SetRightPanelPhasePayload';
 import {EventSubscription} from "fbemitter";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 export enum HeaderKind {
   Room = "room",
@@ -41,6 +42,7 @@ interface IState {
 
 interface IProps {}
 
+@replaceableComponent("views.right_panel.HeaderButtons")
 export default abstract class HeaderButtons extends React.Component<IProps, IState> {
     private storeToken: EventSubscription;
     private dispatcherRef: string;
diff --git a/src/components/views/right_panel/RoomHeaderButtons.tsx b/src/components/views/right_panel/RoomHeaderButtons.tsx
index c2364546fd..0571622e64 100644
--- a/src/components/views/right_panel/RoomHeaderButtons.tsx
+++ b/src/components/views/right_panel/RoomHeaderButtons.tsx
@@ -26,6 +26,7 @@ import {RightPanelPhases} from "../../../stores/RightPanelStorePhases";
 import {Action} from "../../../dispatcher/actions";
 import {ActionPayload} from "../../../dispatcher/payloads";
 import RightPanelStore from "../../../stores/RightPanelStore";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 const ROOM_INFO_PHASES = [
     RightPanelPhases.RoomSummary,
@@ -37,6 +38,7 @@ const ROOM_INFO_PHASES = [
     RightPanelPhases.Room3pidMemberInfo,
 ];
 
+@replaceableComponent("views.right_panel.RoomHeaderButtons")
 export default class RoomHeaderButtons extends HeaderButtons {
     constructor(props) {
         super(props, HeaderKind.Room);
diff --git a/src/components/views/right_panel/VerificationPanel.tsx b/src/components/views/right_panel/VerificationPanel.tsx
index f584a63209..ac01c953b9 100644
--- a/src/components/views/right_panel/VerificationPanel.tsx
+++ b/src/components/views/right_panel/VerificationPanel.tsx
@@ -36,6 +36,7 @@ import {
     PHASE_CANCELLED,
 } from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
 import Spinner from "../elements/Spinner";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 // XXX: Should be defined in matrix-js-sdk
 enum VerificationPhase {
@@ -65,6 +66,7 @@ interface IState {
     reciprocateQREvent?: ReciprocateQRCode;
 }
 
+@replaceableComponent("views.right_panel.VerificationPanel")
 export default class VerificationPanel extends React.PureComponent<IProps, IState> {
     private hasVerifier: boolean;
 
diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js
index eb9276b729..ee8232ebd7 100644
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@@ -26,6 +26,7 @@ import ErrorDialog from "../dialogs/ErrorDialog";
 import AccessibleButton from "../elements/AccessibleButton";
 import Modal from "../../../Modal";
 import RoomPublishSetting from "./RoomPublishSetting";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 class EditableAliasesList extends EditableItemList {
     constructor(props) {
@@ -74,6 +75,7 @@ class EditableAliasesList extends EditableItemList {
     }
 }
 
+@replaceableComponent("views.room_settings.AliasSettings")
 export default class AliasSettings extends React.Component {
     static propTypes = {
         roomId: PropTypes.string.isRequired,
diff --git a/src/components/views/room_settings/RelatedGroupSettings.js b/src/components/views/room_settings/RelatedGroupSettings.js
index af3f58f9db..f82e238722 100644
--- a/src/components/views/room_settings/RelatedGroupSettings.js
+++ b/src/components/views/room_settings/RelatedGroupSettings.js
@@ -22,9 +22,11 @@ import { _t } from '../../../languageHandler';
 import Modal from '../../../Modal';
 import ErrorDialog from "../dialogs/ErrorDialog";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 const GROUP_ID_REGEX = /\+\S+:\S+/;
 
+@replaceableComponent("views.room_settings.RelatedGroupSettings")
 export default class RelatedGroupSettings extends React.Component {
     static propTypes = {
         roomId: PropTypes.string.isRequired,
diff --git a/src/components/views/room_settings/RoomProfileSettings.js b/src/components/views/room_settings/RoomProfileSettings.js
index 65acc802dc..563368384b 100644
--- a/src/components/views/room_settings/RoomProfileSettings.js
+++ b/src/components/views/room_settings/RoomProfileSettings.js
@@ -20,8 +20,10 @@ import {_t} from "../../../languageHandler";
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import Field from "../elements/Field";
 import * as sdk from "../../../index";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 // TODO: Merge with ProfileSettings?
+@replaceableComponent("views.room_settings.RoomProfileSettings")
 export default class RoomProfileSettings extends React.Component {
     static propTypes = {
         roomId: PropTypes.string.isRequired,
diff --git a/src/components/views/room_settings/UrlPreviewSettings.js b/src/components/views/room_settings/UrlPreviewSettings.js
index 114e9b2894..7b04e296e5 100644
--- a/src/components/views/room_settings/UrlPreviewSettings.js
+++ b/src/components/views/room_settings/UrlPreviewSettings.js
@@ -26,8 +26,9 @@ import dis from "../../../dispatcher/dispatcher";
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import {Action} from "../../../dispatcher/actions";
 import {SettingLevel} from "../../../settings/SettingLevel";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
-
+@replaceableComponent("views.room_settings.UrlPreviewSettings")
 export default class UrlPreviewSettings extends React.Component {
     static propTypes = {
         room: PropTypes.object,
diff --git a/src/components/views/rooms/AppsDrawer.js b/src/components/views/rooms/AppsDrawer.js
index aa7120bbe6..3ef8d71682 100644
--- a/src/components/views/rooms/AppsDrawer.js
+++ b/src/components/views/rooms/AppsDrawer.js
@@ -35,7 +35,9 @@ import PercentageDistributor from "../../../resizer/distributors/percentage";
 import {Container, WidgetLayoutStore} from "../../../stores/widgets/WidgetLayoutStore";
 import {clamp, percentageOf, percentageWithin} from "../../../utils/numbers";
 import {useStateCallback} from "../../../hooks/useStateCallback";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.rooms.AppsDrawer")
 export default class AppsDrawer extends React.Component {
     static propTypes = {
         userId: PropTypes.string.isRequired,
diff --git a/src/components/views/rooms/Autocomplete.tsx b/src/components/views/rooms/Autocomplete.tsx
index 15af75084a..a4dcba11a3 100644
--- a/src/components/views/rooms/Autocomplete.tsx
+++ b/src/components/views/rooms/Autocomplete.tsx
@@ -23,6 +23,7 @@ import {Room} from 'matrix-js-sdk/src/models/room';
 
 import SettingsStore from "../../../settings/SettingsStore";
 import Autocompleter from '../../../autocomplete/Autocompleter';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 const COMPOSER_SELECTED = 0;
 
@@ -49,6 +50,7 @@ interface IState {
     forceComplete: boolean;
 }
 
+@replaceableComponent("views.rooms.Autocomplete")
 export default class Autocomplete extends React.PureComponent<IProps, IState> {
     autocompleter: Autocompleter;
     queryRequested: string;
diff --git a/src/components/views/rooms/AuxPanel.tsx b/src/components/views/rooms/AuxPanel.tsx
index d193b98ec1..3d431f7c67 100644
--- a/src/components/views/rooms/AuxPanel.tsx
+++ b/src/components/views/rooms/AuxPanel.tsx
@@ -27,6 +27,7 @@ import {UIFeature} from "../../../settings/UIFeature";
 import { ResizeNotifier } from "../../../utils/ResizeNotifier";
 import CallViewForRoom from '../voip/CallViewForRoom';
 import {objectHasDiff} from "../../../utils/objects";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 interface IProps {
     // js-sdk room object
@@ -58,6 +59,7 @@ interface IState {
     counters: Counter[],
 }
 
+@replaceableComponent("views.rooms.AuxPanel")
 export default class AuxPanel extends React.Component<IProps, IState> {
     static defaultProps = {
         showApps: true,
diff --git a/src/components/views/rooms/BasicMessageComposer.tsx b/src/components/views/rooms/BasicMessageComposer.tsx
index 017ce77166..829809ad49 100644
--- a/src/components/views/rooms/BasicMessageComposer.tsx
+++ b/src/components/views/rooms/BasicMessageComposer.tsx
@@ -46,6 +46,7 @@ import {IDiff} from "../../../editor/diff";
 import AutocompleteWrapperModel from "../../../editor/autocomplete";
 import DocumentPosition from "../../../editor/position";
 import {ICompletion} from "../../../autocomplete/Autocompleter";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 // matches emoticons which follow the start of a line or whitespace
 const REGEX_EMOTICON_WHITESPACE = new RegExp('(?:^|\\s)(' + EMOTICON_REGEX.source + ')\\s$');
@@ -105,6 +106,7 @@ interface IState {
     completionIndex?: number;
 }
 
+@replaceableComponent("views.rooms.BasixMessageEditor")
 export default class BasicMessageEditor extends React.Component<IProps, IState> {
     private editorRef = createRef<HTMLDivElement>();
     private autocompleteRef = createRef<Autocomplete>();
diff --git a/src/components/views/rooms/EditMessageComposer.js b/src/components/views/rooms/EditMessageComposer.js
index c59b3555b9..6ecb2bd549 100644
--- a/src/components/views/rooms/EditMessageComposer.js
+++ b/src/components/views/rooms/EditMessageComposer.js
@@ -34,6 +34,7 @@ import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import {Action} from "../../../dispatcher/actions";
 import SettingsStore from "../../../settings/SettingsStore";
 import CountlyAnalytics from "../../../CountlyAnalytics";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 function _isReply(mxEvent) {
     const relatesTo = mxEvent.getContent()["m.relates_to"];
@@ -102,6 +103,7 @@ function createEditContent(model, editedEvent) {
     }, contentBody);
 }
 
+@replaceableComponent("views.rooms.EditMessageComposer")
 export default class EditMessageComposer extends React.Component {
     static propTypes = {
         // the message event being edited
diff --git a/src/components/views/rooms/EntityTile.js b/src/components/views/rooms/EntityTile.js
index 9017e4aa3e..75b03739b9 100644
--- a/src/components/views/rooms/EntityTile.js
+++ b/src/components/views/rooms/EntityTile.js
@@ -23,6 +23,7 @@ import AccessibleButton from '../elements/AccessibleButton';
 import { _t } from '../../../languageHandler';
 import classNames from "classnames";
 import E2EIcon from './E2EIcon';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 const PRESENCE_CLASS = {
     "offline": "mx_EntityTile_offline",
@@ -50,6 +51,7 @@ function presenceClassForMember(presenceState, lastActiveAgo, showPresence) {
     }
 }
 
+@replaceableComponent("views.rooms.EntityTile")
 class EntityTile extends React.Component {
     static propTypes = {
         name: PropTypes.string,
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index a705e92d9c..1366d9b603 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -39,6 +39,7 @@ import {WidgetType} from "../../../widgets/WidgetType";
 import RoomAvatar from "../avatars/RoomAvatar";
 import {WIDGET_LAYOUT_EVENT_TYPE} from "../../../stores/widgets/WidgetLayoutStore";
 import {objectHasDiff} from "../../../utils/objects";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 const eventTileTypes = {
     'm.room.message': 'messages.MessageEvent',
@@ -146,6 +147,7 @@ const MAX_READ_AVATARS = 5;
 // |    '--------------------------------------'              |
 // '----------------------------------------------------------'
 
+@replaceableComponent("views.rooms.EventTile")
 export default class EventTile extends React.Component {
     static propTypes = {
         /* the MatrixEvent to show */
diff --git a/src/components/views/rooms/ForwardMessage.js b/src/components/views/rooms/ForwardMessage.js
index b85dd2c8df..222895ef04 100644
--- a/src/components/views/rooms/ForwardMessage.js
+++ b/src/components/views/rooms/ForwardMessage.js
@@ -19,8 +19,9 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
 import {Key} from '../../../Keyboard';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
-
+@replaceableComponent("views.rooms.FowardMessage")
 export default class ForwardMessage extends React.Component {
     static propTypes = {
         onCancelClick: PropTypes.func.isRequired,
diff --git a/src/components/views/rooms/LinkPreviewWidget.js b/src/components/views/rooms/LinkPreviewWidget.js
index 2a053bf467..39c9f0bcf7 100644
--- a/src/components/views/rooms/LinkPreviewWidget.js
+++ b/src/components/views/rooms/LinkPreviewWidget.js
@@ -25,7 +25,9 @@ import * as sdk from "../../../index";
 import Modal from "../../../Modal";
 import * as ImageUtils from "../../../ImageUtils";
 import { _t } from "../../../languageHandler";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.rooms.LinkPreviewWidget")
 export default class LinkPreviewWidget extends React.Component {
     static propTypes = {
         link: PropTypes.string.isRequired, // the URL being previewed
diff --git a/src/components/views/rooms/MemberList.js b/src/components/views/rooms/MemberList.js
index d4d618c821..593132a283 100644
--- a/src/components/views/rooms/MemberList.js
+++ b/src/components/views/rooms/MemberList.js
@@ -29,6 +29,7 @@ import BaseCard from "../right_panel/BaseCard";
 import {RightPanelPhases} from "../../../stores/RightPanelStorePhases";
 import RoomAvatar from "../avatars/RoomAvatar";
 import RoomName from "../elements/RoomName";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 const INITIAL_LOAD_NUM_MEMBERS = 30;
 const INITIAL_LOAD_NUM_INVITED = 5;
@@ -38,6 +39,7 @@ const SHOW_MORE_INCREMENT = 100;
 // matches all ASCII punctuation: !"#$%&'()*+,-./:;<=>?@[\]^_`{|}~
 const SORT_REGEX = /[\x21-\x2F\x3A-\x40\x5B-\x60\x7B-\x7E]+/g;
 
+@replaceableComponent("views.rooms.MemberList")
 export default class MemberList extends React.Component {
     constructor(props) {
         super(props);
diff --git a/src/components/views/rooms/MemberTile.js b/src/components/views/rooms/MemberTile.js
index a43b42b6d3..f8df7ed78f 100644
--- a/src/components/views/rooms/MemberTile.js
+++ b/src/components/views/rooms/MemberTile.js
@@ -23,7 +23,9 @@ import dis from "../../../dispatcher/dispatcher";
 import { _t } from '../../../languageHandler';
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import {Action} from "../../../dispatcher/actions";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.rooms.MemberTile")
 export default class MemberTile extends React.Component {
     static propTypes = {
         member: PropTypes.any.isRequired, // RoomMember
diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index c03178cdf7..ccf097c4fd 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -32,6 +32,7 @@ import {UIFeature} from "../../../settings/UIFeature";
 import WidgetStore from "../../../stores/WidgetStore";
 import {UPDATE_EVENT} from "../../../stores/AsyncStore";
 import ActiveWidgetStore from "../../../stores/ActiveWidgetStore";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 function ComposerAvatar(props) {
     const MemberStatusMessageAvatar = sdk.getComponent('avatars.MemberStatusMessageAvatar');
@@ -168,6 +169,7 @@ class UploadButton extends React.Component {
     }
 }
 
+@replaceableComponent("views.rooms.MessageComposer")
 export default class MessageComposer extends React.Component {
     constructor(props) {
         super(props);
diff --git a/src/components/views/rooms/MessageComposerFormatBar.js b/src/components/views/rooms/MessageComposerFormatBar.js
index 71aef1e833..d2539b1ef4 100644
--- a/src/components/views/rooms/MessageComposerFormatBar.js
+++ b/src/components/views/rooms/MessageComposerFormatBar.js
@@ -19,7 +19,9 @@ import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
 import classNames from 'classnames';
 import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.rooms.MessageComposerFormatBar")
 export default class MessageComposerFormatBar extends React.PureComponent {
     static propTypes = {
         onAction: PropTypes.func.isRequired,
diff --git a/src/components/views/rooms/NotificationBadge.tsx b/src/components/views/rooms/NotificationBadge.tsx
index 8b996d3238..36a52e260d 100644
--- a/src/components/views/rooms/NotificationBadge.tsx
+++ b/src/components/views/rooms/NotificationBadge.tsx
@@ -21,6 +21,7 @@ import SettingsStore from "../../../settings/SettingsStore";
 import AccessibleButton from "../elements/AccessibleButton";
 import { XOR } from "../../../@types/common";
 import { NOTIFICATION_STATE_UPDATE, NotificationState } from "../../../stores/notifications/NotificationState";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 interface IProps {
     notification: NotificationState;
@@ -48,6 +49,7 @@ interface IState {
     showCounts: boolean; // whether or not to show counts. Independent of props.forceCount
 }
 
+@replaceableComponent("views.rooms.NotificationBadge")
 export default class NotificationBadge extends React.PureComponent<XOR<IProps, IClickableProps>, IState> {
     private countWatcherRef: string;
 
diff --git a/src/components/views/rooms/PinnedEventTile.js b/src/components/views/rooms/PinnedEventTile.js
index 9fad0c2391..2259cad7fb 100644
--- a/src/components/views/rooms/PinnedEventTile.js
+++ b/src/components/views/rooms/PinnedEventTile.js
@@ -23,7 +23,9 @@ import MessageEvent from "../messages/MessageEvent";
 import MemberAvatar from "../avatars/MemberAvatar";
 import { _t } from '../../../languageHandler';
 import {formatFullDate} from '../../../DateUtils';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.rooms.PinnedEventTile")
 export default class PinnedEventTile extends React.Component {
     static propTypes = {
         mxRoom: PropTypes.object.isRequired,
diff --git a/src/components/views/rooms/PinnedEventsPanel.js b/src/components/views/rooms/PinnedEventsPanel.js
index 3ea0299976..285829bf63 100644
--- a/src/components/views/rooms/PinnedEventsPanel.js
+++ b/src/components/views/rooms/PinnedEventsPanel.js
@@ -22,7 +22,9 @@ import AccessibleButton from "../elements/AccessibleButton";
 import PinnedEventTile from "./PinnedEventTile";
 import { _t } from '../../../languageHandler';
 import PinningUtils from "../../../utils/PinningUtils";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.rooms.PinnedEventsPanel")
 export default class PinnedEventsPanel extends React.Component {
     static propTypes = {
         // The Room from the js-sdk we're going to show pinned events for
diff --git a/src/components/views/rooms/PresenceLabel.js b/src/components/views/rooms/PresenceLabel.js
index ff1460ca21..ca21afe63d 100644
--- a/src/components/views/rooms/PresenceLabel.js
+++ b/src/components/views/rooms/PresenceLabel.js
@@ -18,8 +18,9 @@ import React from 'react';
 import PropTypes from 'prop-types';
 
 import { _t } from '../../../languageHandler';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
-
+@replaceableComponent("views.rooms.PresenceLabel")
 export default class PresenceLabel extends React.Component {
     static propTypes = {
         // number of milliseconds ago this user was last active.
diff --git a/src/components/views/rooms/ReadReceiptMarker.js b/src/components/views/rooms/ReadReceiptMarker.js
index ba2b3064fd..ade84cbef3 100644
--- a/src/components/views/rooms/ReadReceiptMarker.js
+++ b/src/components/views/rooms/ReadReceiptMarker.js
@@ -23,6 +23,7 @@ import {formatDate} from '../../../DateUtils';
 import Velociraptor from "../../../Velociraptor";
 import * as sdk from "../../../index";
 import {toPx} from "../../../utils/units";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 let bounce = false;
 try {
@@ -32,6 +33,7 @@ try {
 } catch (e) {
 }
 
+@replaceableComponent("views.rooms.ReadReceiptMarker")
 export default class ReadReceiptMarker extends React.PureComponent {
     static propTypes = {
         // the RoomMember to show the RR for
diff --git a/src/components/views/rooms/ReplyPreview.js b/src/components/views/rooms/ReplyPreview.js
index c7872d95ed..0d99be4f53 100644
--- a/src/components/views/rooms/ReplyPreview.js
+++ b/src/components/views/rooms/ReplyPreview.js
@@ -23,6 +23,7 @@ import SettingsStore from "../../../settings/SettingsStore";
 import PropTypes from "prop-types";
 import {RoomPermalinkCreator} from "../../../utils/permalinks/Permalinks";
 import {UIFeature} from "../../../settings/UIFeature";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 function cancelQuoting() {
     dis.dispatch({
@@ -31,6 +32,7 @@ function cancelQuoting() {
     });
 }
 
+@replaceableComponent("views.rooms.ReplyPreview")
 export default class ReplyPreview extends React.Component {
     static propTypes = {
         permalinkCreator: PropTypes.instanceOf(RoomPermalinkCreator).isRequired,
diff --git a/src/components/views/rooms/RoomBreadcrumbs.tsx b/src/components/views/rooms/RoomBreadcrumbs.tsx
index ff60ab7779..ea0ff233da 100644
--- a/src/components/views/rooms/RoomBreadcrumbs.tsx
+++ b/src/components/views/rooms/RoomBreadcrumbs.tsx
@@ -27,6 +27,7 @@ import RoomListStore from "../../../stores/room-list/RoomListStore";
 import { DefaultTagID } from "../../../stores/room-list/models";
 import { RovingAccessibleTooltipButton } from "../../../accessibility/RovingTabIndex";
 import Toolbar from "../../../accessibility/Toolbar";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 interface IProps {
 }
@@ -42,6 +43,7 @@ interface IState {
     skipFirst: boolean;
 }
 
+@replaceableComponent("views.rooms.RoomBreadcrumbs")
 export default class RoomBreadcrumbs extends React.PureComponent<IProps, IState> {
     private isMounted = true;
 
diff --git a/src/components/views/rooms/RoomDetailList.js b/src/components/views/rooms/RoomDetailList.js
index d8205aeb21..be22cda199 100644
--- a/src/components/views/rooms/RoomDetailList.js
+++ b/src/components/views/rooms/RoomDetailList.js
@@ -22,7 +22,9 @@ import PropTypes from 'prop-types';
 import classNames from 'classnames';
 
 import {roomShape} from './RoomDetailRow';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.rooms.RoomDetailList")
 export default class RoomDetailList extends React.Component {
     static propTypes = {
         rooms: PropTypes.arrayOf(roomShape),
diff --git a/src/components/views/rooms/RoomDetailRow.js b/src/components/views/rooms/RoomDetailRow.js
index 667f821922..e7c259cd98 100644
--- a/src/components/views/rooms/RoomDetailRow.js
+++ b/src/components/views/rooms/RoomDetailRow.js
@@ -21,6 +21,7 @@ import { linkifyElement } from '../../../HtmlUtils';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import PropTypes from 'prop-types';
 import {getHttpUriForMxc} from "matrix-js-sdk/src/content-repo";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 export function getDisplayAliasForRoom(room) {
     return room.canonicalAlias || (room.aliases ? room.aliases[0] : "");
@@ -39,6 +40,7 @@ export const roomShape = PropTypes.shape({
     guestCanJoin: PropTypes.bool,
 });
 
+@replaceableComponent("views.rooms.RoomDetailRow")
 export default class RoomDetailRow extends React.Component {
     static propTypes = {
         room: roomShape,
diff --git a/src/components/views/rooms/RoomHeader.js b/src/components/views/rooms/RoomHeader.js
index 6736600bc8..f856f7f6ef 100644
--- a/src/components/views/rooms/RoomHeader.js
+++ b/src/components/views/rooms/RoomHeader.js
@@ -32,7 +32,9 @@ import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
 import RoomTopic from "../elements/RoomTopic";
 import RoomName from "../elements/RoomName";
 import {PlaceCallType} from "../../../CallHandler";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.rooms.RoomHeader")
 export default class RoomHeader extends React.Component {
     static propTypes = {
         room: PropTypes.object,
diff --git a/src/components/views/rooms/RoomList.tsx b/src/components/views/rooms/RoomList.tsx
index f7da6571da..ff6e3793bf 100644
--- a/src/components/views/rooms/RoomList.tsx
+++ b/src/components/views/rooms/RoomList.tsx
@@ -50,6 +50,7 @@ import CallHandler from "../../../CallHandler";
 import SpaceStore from "../../../stores/SpaceStore";
 import { showAddExistingRooms, showCreateNewRoom } from "../../../utils/space";
 import { EventType } from "matrix-js-sdk/src/@types/event";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 interface IProps {
     onKeyDown: (ev: React.KeyboardEvent) => void;
@@ -256,6 +257,7 @@ function customTagAesthetics(tagId: TagID): ITagAesthetics {
     };
 }
 
+@replaceableComponent("views.rooms.RoomList")
 export default class RoomList extends React.PureComponent<IProps, IState> {
     private dispatcherRef;
     private customTagStoreRef;
diff --git a/src/components/views/rooms/RoomPreviewBar.js b/src/components/views/rooms/RoomPreviewBar.js
index dc68068157..36038da61c 100644
--- a/src/components/views/rooms/RoomPreviewBar.js
+++ b/src/components/views/rooms/RoomPreviewBar.js
@@ -27,6 +27,7 @@ import SdkConfig from "../../../SdkConfig";
 import IdentityAuthClient from '../../../IdentityAuthClient';
 import {CommunityPrototypeStore} from "../../../stores/CommunityPrototypeStore";
 import {UPDATE_EVENT} from "../../../stores/AsyncStore";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 const MessageCase = Object.freeze({
     NotLoggedIn: "NotLoggedIn",
@@ -45,6 +46,7 @@ const MessageCase = Object.freeze({
     OtherError: "OtherError",
 });
 
+@replaceableComponent("views.rooms.RoomPreviewBar")
 export default class RoomPreviewBar extends React.Component {
     static propTypes = {
         onJoinClick: PropTypes.func,
diff --git a/src/components/views/rooms/RoomSublist.tsx b/src/components/views/rooms/RoomSublist.tsx
index a2574bf60c..cb98ba85e4 100644
--- a/src/components/views/rooms/RoomSublist.tsx
+++ b/src/components/views/rooms/RoomSublist.tsx
@@ -51,6 +51,7 @@ import { objectExcluding, objectHasDiff } from "../../../utils/objects";
 import TemporaryTile from "./TemporaryTile";
 import { ListNotificationState } from "../../../stores/notifications/ListNotificationState";
 import IconizedContextMenu from "../context_menus/IconizedContextMenu";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 const SHOW_N_BUTTON_HEIGHT = 28; // As defined by CSS
 const RESIZE_HANDLE_HEIGHT = 4; // As defined by CSS
@@ -98,6 +99,7 @@ interface IState {
     filteredExtraTiles?: TemporaryTile[];
 }
 
+@replaceableComponent("views.rooms.RoomSublist")
 export default class RoomSublist extends React.Component<IProps, IState> {
     private headerButton = createRef<HTMLDivElement>();
     private sublistRef = createRef<HTMLDivElement>();
diff --git a/src/components/views/rooms/RoomTile.tsx b/src/components/views/rooms/RoomTile.tsx
index 835447dc18..07de70fe45 100644
--- a/src/components/views/rooms/RoomTile.tsx
+++ b/src/components/views/rooms/RoomTile.tsx
@@ -51,6 +51,7 @@ import IconizedContextMenu, {
     IconizedContextMenuRadio,
 } from "../context_menus/IconizedContextMenu";
 import { CommunityPrototypeStore, IRoomProfile } from "../../../stores/CommunityPrototypeStore";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 interface IProps {
     room: Room;
@@ -78,6 +79,7 @@ const contextMenuBelow = (elementRect: PartialDOMRect) => {
     return {left, top, chevronFace};
 };
 
+@replaceableComponent("views.rooms.RoomTile")
 export default class RoomTile extends React.PureComponent<IProps, IState> {
     private dispatcherRef: string;
     private roomTileRef = createRef<HTMLDivElement>();
diff --git a/src/components/views/rooms/RoomUpgradeWarningBar.js b/src/components/views/rooms/RoomUpgradeWarningBar.js
index 877cfb39d7..a2d4f92d35 100644
--- a/src/components/views/rooms/RoomUpgradeWarningBar.js
+++ b/src/components/views/rooms/RoomUpgradeWarningBar.js
@@ -21,7 +21,9 @@ import Modal from '../../../Modal';
 
 import { _t } from '../../../languageHandler';
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.rooms.RoomUpgradeWarningBar")
 export default class RoomUpgradeWarningBar extends React.Component {
     static propTypes = {
         room: PropTypes.object.isRequired,
diff --git a/src/components/views/rooms/SearchBar.js b/src/components/views/rooms/SearchBar.js
index ac637673e4..029516c932 100644
--- a/src/components/views/rooms/SearchBar.js
+++ b/src/components/views/rooms/SearchBar.js
@@ -21,7 +21,9 @@ import classNames from "classnames";
 import { _t } from '../../../languageHandler';
 import {Key} from "../../../Keyboard";
 import DesktopBuildsNotice, {WarningKind} from "../elements/DesktopBuildsNotice";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.rooms.SearchBar")
 export default class SearchBar extends React.Component {
     constructor(props) {
         super(props);
diff --git a/src/components/views/rooms/SearchResultTile.js b/src/components/views/rooms/SearchResultTile.js
index 29def9e368..dcfd633e76 100644
--- a/src/components/views/rooms/SearchResultTile.js
+++ b/src/components/views/rooms/SearchResultTile.js
@@ -21,7 +21,9 @@ import * as sdk from '../../../index';
 import {haveTileForEvent} from "./EventTile";
 import SettingsStore from "../../../settings/SettingsStore";
 import {UIFeature} from "../../../settings/UIFeature";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.rooms.SearchResultTile")
 export default class SearchResultTile extends React.Component {
     static propTypes = {
         // a matrix-js-sdk SearchResult containing the details of this result
diff --git a/src/components/views/rooms/SendMessageComposer.js b/src/components/views/rooms/SendMessageComposer.js
index 673df949f7..ba3076c07d 100644
--- a/src/components/views/rooms/SendMessageComposer.js
+++ b/src/components/views/rooms/SendMessageComposer.js
@@ -48,6 +48,7 @@ import SettingsStore from "../../../settings/SettingsStore";
 import CountlyAnalytics from "../../../CountlyAnalytics";
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import EMOJI_REGEX from 'emojibase-regex';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 function addReplyToMessageContent(content, repliedToEvent, permalinkCreator) {
     const replyContent = ReplyThread.makeReplyMixIn(repliedToEvent);
@@ -111,6 +112,7 @@ export function isQuickReaction(model) {
     return false;
 }
 
+@replaceableComponent("views.rooms.SendMessageComposer")
 export default class SendMessageComposer extends React.Component {
     static propTypes = {
         room: PropTypes.object.isRequired,
diff --git a/src/components/views/rooms/SimpleRoomHeader.js b/src/components/views/rooms/SimpleRoomHeader.js
index 1c78253eff..b2a66f6670 100644
--- a/src/components/views/rooms/SimpleRoomHeader.js
+++ b/src/components/views/rooms/SimpleRoomHeader.js
@@ -19,6 +19,7 @@ import PropTypes from 'prop-types';
 import AccessibleButton from '../elements/AccessibleButton';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 // cancel button which is shared between room header and simple room header
 export function CancelButton(props) {
@@ -36,6 +37,7 @@ export function CancelButton(props) {
  * A stripped-down room header used for things like the user settings
  * and room directory.
  */
+@replaceableComponent("views.rooms.SimpleRoomHeader")
 export default class SimpleRoomHeader extends React.Component {
     static propTypes = {
         title: PropTypes.string,
diff --git a/src/components/views/rooms/Stickerpicker.js b/src/components/views/rooms/Stickerpicker.js
index 5446d15671..44d31d7146 100644
--- a/src/components/views/rooms/Stickerpicker.js
+++ b/src/components/views/rooms/Stickerpicker.js
@@ -30,6 +30,7 @@ import {WidgetType} from "../../../widgets/WidgetType";
 import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
 import {Action} from "../../../dispatcher/actions";
 import {WidgetMessagingStore} from "../../../stores/widgets/WidgetMessagingStore";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 // 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.
@@ -38,6 +39,7 @@ const STICKERPICKER_Z_INDEX = 3500;
 // Key to store the widget's AppTile under in PersistedElement
 const PERSISTED_ELEMENT_KEY = "stickerPicker";
 
+@replaceableComponent("views.rooms.Stickerpicker")
 export default class Stickerpicker extends React.Component {
     static currentWidget;
 
diff --git a/src/components/views/rooms/TemporaryTile.tsx b/src/components/views/rooms/TemporaryTile.tsx
index eec3105880..a9765faa5d 100644
--- a/src/components/views/rooms/TemporaryTile.tsx
+++ b/src/components/views/rooms/TemporaryTile.tsx
@@ -22,6 +22,7 @@ import {
 } from "../../../accessibility/RovingTabIndex";
 import NotificationBadge from "./NotificationBadge";
 import { NotificationState } from "../../../stores/notifications/NotificationState";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 interface IProps {
     isMinimized: boolean;
@@ -37,6 +38,7 @@ interface IState {
 }
 
 // TODO: Remove with community invites in the room list: https://github.com/vector-im/element-web/issues/14456
+@replaceableComponent("views.rooms.TemporaryTile")
 export default class TemporaryTile extends React.Component<IProps, IState> {
     constructor(props: IProps) {
         super(props);
diff --git a/src/components/views/rooms/ThirdPartyMemberInfo.js b/src/components/views/rooms/ThirdPartyMemberInfo.js
index 73510c2b4f..5e2d82a1b2 100644
--- a/src/components/views/rooms/ThirdPartyMemberInfo.js
+++ b/src/components/views/rooms/ThirdPartyMemberInfo.js
@@ -25,7 +25,9 @@ import Modal from "../../../Modal";
 import {isValid3pidInvite} from "../../../RoomInvite";
 import RoomAvatar from "../avatars/RoomAvatar";
 import RoomName from "../elements/RoomName";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.rooms.ThirdPartyMemberInfo")
 export default class ThirdPartyMemberInfo extends React.Component {
     static propTypes = {
         event: PropTypes.instanceOf(MatrixEvent).isRequired,
diff --git a/src/components/views/rooms/TopUnreadMessagesBar.js b/src/components/views/rooms/TopUnreadMessagesBar.js
index 9ac3c49ef4..cba99ac913 100644
--- a/src/components/views/rooms/TopUnreadMessagesBar.js
+++ b/src/components/views/rooms/TopUnreadMessagesBar.js
@@ -20,7 +20,9 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
 import AccessibleButton from '../elements/AccessibleButton';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.rooms.TopUnreadMessagesBar")
 export default class TopUnreadMessagesBar extends React.Component {
     static propTypes = {
         onScrollUpClick: PropTypes.func,
diff --git a/src/components/views/rooms/WhoIsTypingTile.js b/src/components/views/rooms/WhoIsTypingTile.js
index 905cbe6d09..a25b43fc3a 100644
--- a/src/components/views/rooms/WhoIsTypingTile.js
+++ b/src/components/views/rooms/WhoIsTypingTile.js
@@ -21,7 +21,9 @@ import * as WhoIsTyping from '../../../WhoIsTyping';
 import Timer from '../../../utils/Timer';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import MemberAvatar from '../avatars/MemberAvatar';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.rooms.WhoIsTypingTile")
 export default class WhoIsTypingTile extends React.Component {
     static propTypes = {
         // the room this statusbar is representing.

From 41576954fd3dfbdff9604a76760e10db44c8f5b4 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 8 Mar 2021 20:20:07 -0700
Subject: [PATCH 225/420] Batch of views getting replaceableComponent
 decorators

---
 src/components/views/settings/BridgeTile.tsx                   | 2 ++
 src/components/views/settings/ChangeAvatar.js                  | 2 ++
 src/components/views/settings/ChangeDisplayName.js             | 2 ++
 src/components/views/settings/ChangePassword.js                | 2 ++
 src/components/views/settings/CrossSigningPanel.js             | 2 ++
 src/components/views/settings/DevicesPanel.js                  | 2 ++
 src/components/views/settings/DevicesPanelEntry.js             | 2 ++
 src/components/views/settings/EventIndexPanel.js               | 2 ++
 src/components/views/settings/IntegrationManager.js            | 2 ++
 src/components/views/settings/Notifications.js                 | 2 ++
 src/components/views/settings/ProfileSettings.js               | 2 ++
 src/components/views/settings/SecureBackupPanel.js             | 2 ++
 src/components/views/settings/SetIdServer.js                   | 2 ++
 src/components/views/settings/SetIntegrationManager.js         | 2 ++
 src/components/views/settings/SpellCheckSettings.tsx           | 2 ++
 src/components/views/settings/account/EmailAddresses.js        | 2 ++
 src/components/views/settings/account/PhoneNumbers.js          | 2 ++
 src/components/views/settings/discovery/EmailAddresses.js      | 2 ++
 src/components/views/settings/discovery/PhoneNumbers.js        | 2 ++
 .../views/settings/tabs/room/AdvancedRoomSettingsTab.js        | 2 ++
 src/components/views/settings/tabs/room/BridgeSettingsTab.tsx  | 2 ++
 .../views/settings/tabs/room/GeneralRoomSettingsTab.js         | 2 ++
 .../views/settings/tabs/room/NotificationSettingsTab.js        | 2 ++
 .../views/settings/tabs/room/RolesRoomSettingsTab.js           | 2 ++
 .../views/settings/tabs/room/SecurityRoomSettingsTab.js        | 2 ++
 .../views/settings/tabs/user/AppearanceUserSettingsTab.tsx     | 3 ++-
 .../views/settings/tabs/user/FlairUserSettingsTab.js           | 2 ++
 .../views/settings/tabs/user/GeneralUserSettingsTab.js         | 2 ++
 src/components/views/settings/tabs/user/HelpUserSettingsTab.js | 2 ++
 src/components/views/settings/tabs/user/LabsUserSettingsTab.js | 2 ++
 .../views/settings/tabs/user/MjolnirUserSettingsTab.js         | 2 ++
 .../views/settings/tabs/user/NotificationUserSettingsTab.js    | 2 ++
 .../views/settings/tabs/user/PreferencesUserSettingsTab.js     | 2 ++
 .../views/settings/tabs/user/SecurityUserSettingsTab.js        | 2 ++
 .../views/settings/tabs/user/VoiceUserSettingsTab.js           | 2 ++
 src/components/views/terms/InlineTermsAgreement.js             | 2 ++
 src/components/views/toasts/NonUrgentEchoFailureToast.tsx      | 2 ++
 src/components/views/toasts/VerificationRequestToast.tsx       | 2 ++
 src/components/views/verification/VerificationCancelled.js     | 2 ++
 src/components/views/verification/VerificationComplete.js      | 2 ++
 src/components/views/verification/VerificationShowSas.js       | 2 ++
 src/components/views/voip/CallContainer.tsx                    | 2 ++
 src/components/views/voip/CallPreview.tsx                      | 2 ++
 src/components/views/voip/CallView.tsx                         | 2 ++
 src/components/views/voip/CallViewForRoom.tsx                  | 2 ++
 src/components/views/voip/DialPad.tsx                          | 2 ++
 src/components/views/voip/DialPadModal.tsx                     | 2 ++
 src/components/views/voip/IncomingCallBox.tsx                  | 2 ++
 src/components/views/voip/VideoFeed.tsx                        | 2 ++
 49 files changed, 98 insertions(+), 1 deletion(-)

diff --git a/src/components/views/settings/BridgeTile.tsx b/src/components/views/settings/BridgeTile.tsx
index 58499ebd25..b33219ad4a 100644
--- a/src/components/views/settings/BridgeTile.tsx
+++ b/src/components/views/settings/BridgeTile.tsx
@@ -26,6 +26,7 @@ import SettingsStore from "../../../settings/SettingsStore";
 import {MatrixEvent} from "matrix-js-sdk/src/models/event";
 import { Room } from "matrix-js-sdk/src/models/room";
 import { isUrlPermitted } from '../../../HtmlUtils';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 interface IProps {
     ev: MatrixEvent;
@@ -64,6 +65,7 @@ interface IBridgeStateEvent {
     };
 }
 
+@replaceableComponent("views.settings.BridgeTile")
 export default class BridgeTile extends React.PureComponent<IProps> {
     static propTypes = {
         ev: PropTypes.object.isRequired,
diff --git a/src/components/views/settings/ChangeAvatar.js b/src/components/views/settings/ChangeAvatar.js
index 7ab2936584..8067046ffd 100644
--- a/src/components/views/settings/ChangeAvatar.js
+++ b/src/components/views/settings/ChangeAvatar.js
@@ -20,7 +20,9 @@ import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import Spinner from '../elements/Spinner';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.settings.ChangeAvatar")
 export default class ChangeAvatar extends React.Component {
     static propTypes = {
         initialAvatarUrl: PropTypes.string,
diff --git a/src/components/views/settings/ChangeDisplayName.js b/src/components/views/settings/ChangeDisplayName.js
index 538e52d0ca..cae4a22be9 100644
--- a/src/components/views/settings/ChangeDisplayName.js
+++ b/src/components/views/settings/ChangeDisplayName.js
@@ -20,7 +20,9 @@ import React from 'react';
 import * as sdk from '../../../index';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.settings.ChangeDisplayName")
 export default class ChangeDisplayName extends React.Component {
     _getDisplayName = async () => {
         const cli = MatrixClientPeg.get();
diff --git a/src/components/views/settings/ChangePassword.js b/src/components/views/settings/ChangePassword.js
index 22b758b1ca..aa635ef974 100644
--- a/src/components/views/settings/ChangePassword.js
+++ b/src/components/views/settings/ChangePassword.js
@@ -27,6 +27,7 @@ import * as sdk from "../../../index";
 import Modal from "../../../Modal";
 import PassphraseField from "../auth/PassphraseField";
 import CountlyAnalytics from "../../../CountlyAnalytics";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 const FIELD_OLD_PASSWORD = 'field_old_password';
 const FIELD_NEW_PASSWORD = 'field_new_password';
@@ -34,6 +35,7 @@ const FIELD_NEW_PASSWORD_CONFIRM = 'field_new_password_confirm';
 
 const PASSWORD_MIN_SCORE = 3; // safely unguessable: moderate protection from offline slow-hash scenario.
 
+@replaceableComponent("views.settings.ChangePassword")
 export default class ChangePassword extends React.Component {
     static propTypes = {
         onFinished: PropTypes.func,
diff --git a/src/components/views/settings/CrossSigningPanel.js b/src/components/views/settings/CrossSigningPanel.js
index 1c548bd9d8..e5f57d1af2 100644
--- a/src/components/views/settings/CrossSigningPanel.js
+++ b/src/components/views/settings/CrossSigningPanel.js
@@ -23,7 +23,9 @@ import Modal from '../../../Modal';
 import Spinner from '../elements/Spinner';
 import InteractiveAuthDialog from '../dialogs/InteractiveAuthDialog';
 import ConfirmDestroyCrossSigningDialog from '../dialogs/security/ConfirmDestroyCrossSigningDialog';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.settings.CrossSigningPanel")
 export default class CrossSigningPanel extends React.PureComponent {
     constructor(props) {
         super(props);
diff --git a/src/components/views/settings/DevicesPanel.js b/src/components/views/settings/DevicesPanel.js
index dc3ce9e03d..e7d300b0f8 100644
--- a/src/components/views/settings/DevicesPanel.js
+++ b/src/components/views/settings/DevicesPanel.js
@@ -24,7 +24,9 @@ import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
 import Modal from '../../../Modal';
 import {SSOAuthEntry} from "../auth/InteractiveAuthEntryComponents";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.settings.DevicesPanel")
 export default class DevicesPanel extends React.Component {
     constructor(props) {
         super(props);
diff --git a/src/components/views/settings/DevicesPanelEntry.js b/src/components/views/settings/DevicesPanelEntry.js
index 567b144a92..93d4c78476 100644
--- a/src/components/views/settings/DevicesPanelEntry.js
+++ b/src/components/views/settings/DevicesPanelEntry.js
@@ -22,7 +22,9 @@ import { _t } from '../../../languageHandler';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import {formatDate} from '../../../DateUtils';
 import StyledCheckbox from '../elements/StyledCheckbox';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.settings.DevicesPanelEntry")
 export default class DevicesPanelEntry extends React.Component {
     constructor(props) {
         super(props);
diff --git a/src/components/views/settings/EventIndexPanel.js b/src/components/views/settings/EventIndexPanel.js
index ec6ccacc9a..d78b99fc5d 100644
--- a/src/components/views/settings/EventIndexPanel.js
+++ b/src/components/views/settings/EventIndexPanel.js
@@ -25,7 +25,9 @@ import AccessibleButton from "../elements/AccessibleButton";
 import {formatBytes, formatCountLong} from "../../../utils/FormattingUtils";
 import EventIndexPeg from "../../../indexing/EventIndexPeg";
 import {SettingLevel} from "../../../settings/SettingLevel";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.settings.EventIndexPanel")
 export default class EventIndexPanel extends React.Component {
     constructor() {
         super();
diff --git a/src/components/views/settings/IntegrationManager.js b/src/components/views/settings/IntegrationManager.js
index da11832cf5..b058625139 100644
--- a/src/components/views/settings/IntegrationManager.js
+++ b/src/components/views/settings/IntegrationManager.js
@@ -21,7 +21,9 @@ import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import dis from '../../../dispatcher/dispatcher';
 import {Key} from "../../../Keyboard";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.settings.IntegrationManager")
 export default class IntegrationManager extends React.Component {
     static propTypes = {
         // false to display an error saying that we couldn't connect to the integration manager
diff --git a/src/components/views/settings/Notifications.js b/src/components/views/settings/Notifications.js
index 1337991dc3..25fe434994 100644
--- a/src/components/views/settings/Notifications.js
+++ b/src/components/views/settings/Notifications.js
@@ -32,6 +32,7 @@ import LabelledToggleSwitch from "../elements/LabelledToggleSwitch";
 import AccessibleButton from "../elements/AccessibleButton";
 import {SettingLevel} from "../../../settings/SettingLevel";
 import {UIFeature} from "../../../settings/UIFeature";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 // TODO: this "view" component still has far too much application logic in it,
 // which should be factored out to other files.
@@ -65,6 +66,7 @@ function portLegacyActions(actions) {
     }
 }
 
+@replaceableComponent("views.settings.Notifications")
 export default class Notifications extends React.Component {
     static phases = {
         LOADING: "LOADING", // The component is loading or sending data to the hs
diff --git a/src/components/views/settings/ProfileSettings.js b/src/components/views/settings/ProfileSettings.js
index 89d7cf6c2b..30dcdc3c47 100644
--- a/src/components/views/settings/ProfileSettings.js
+++ b/src/components/views/settings/ProfileSettings.js
@@ -23,7 +23,9 @@ import * as sdk from "../../../index";
 import {OwnProfileStore} from "../../../stores/OwnProfileStore";
 import Modal from "../../../Modal";
 import ErrorDialog from "../dialogs/ErrorDialog";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.settings.ProfileSettings")
 export default class ProfileSettings extends React.Component {
     constructor() {
         super();
diff --git a/src/components/views/settings/SecureBackupPanel.js b/src/components/views/settings/SecureBackupPanel.js
index 080d83b2cf..310114c8af 100644
--- a/src/components/views/settings/SecureBackupPanel.js
+++ b/src/components/views/settings/SecureBackupPanel.js
@@ -26,7 +26,9 @@ import AccessibleButton from '../elements/AccessibleButton';
 import QuestionDialog from '../dialogs/QuestionDialog';
 import RestoreKeyBackupDialog from '../dialogs/security/RestoreKeyBackupDialog';
 import { accessSecretStorage } from '../../../SecurityManager';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.settings.SecureBackupPanel")
 export default class SecureBackupPanel extends React.PureComponent {
     constructor(props) {
         super(props);
diff --git a/src/components/views/settings/SetIdServer.js b/src/components/views/settings/SetIdServer.js
index e05fe4f1c3..fa2a36476d 100644
--- a/src/components/views/settings/SetIdServer.js
+++ b/src/components/views/settings/SetIdServer.js
@@ -27,6 +27,7 @@ import IdentityAuthClient from "../../../IdentityAuthClient";
 import {abbreviateUrl, unabbreviateUrl} from "../../../utils/UrlUtils";
 import { getDefaultIdentityServerUrl, doesIdentityServerHaveTerms } from '../../../utils/IdentityServerUtils';
 import {timeout} from "../../../utils/promise";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 // We'll wait up to this long when checking for 3PID bindings on the IS.
 const REACHABILITY_TIMEOUT = 10000; // ms
@@ -58,6 +59,7 @@ async function checkIdentityServerUrl(u) {
     }
 }
 
+@replaceableComponent("views.settings.SetIdServer")
 export default class SetIdServer extends React.Component {
     static propTypes = {
         // Whether or not the ID server is missing terms. This affects the text
diff --git a/src/components/views/settings/SetIntegrationManager.js b/src/components/views/settings/SetIntegrationManager.js
index e6fb3f6e1c..29cc5d7131 100644
--- a/src/components/views/settings/SetIntegrationManager.js
+++ b/src/components/views/settings/SetIntegrationManager.js
@@ -20,7 +20,9 @@ import {IntegrationManagers} from "../../../integrations/IntegrationManagers";
 import * as sdk from '../../../index';
 import SettingsStore from "../../../settings/SettingsStore";
 import {SettingLevel} from "../../../settings/SettingLevel";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.settings.SetIntegrationManager")
 export default class SetIntegrationManager extends React.Component {
     constructor() {
         super();
diff --git a/src/components/views/settings/SpellCheckSettings.tsx b/src/components/views/settings/SpellCheckSettings.tsx
index d08f263b5f..e5455c8c68 100644
--- a/src/components/views/settings/SpellCheckSettings.tsx
+++ b/src/components/views/settings/SpellCheckSettings.tsx
@@ -18,6 +18,7 @@ import React from 'react';
 import SpellCheckLanguagesDropdown from "../../../components/views/elements/SpellCheckLanguagesDropdown";
 import AccessibleButton from "../../../components/views/elements/AccessibleButton";
 import {_t} from "../../../languageHandler";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 interface ExistingSpellCheckLanguageIProps {
     language: string,
@@ -53,6 +54,7 @@ export class ExistingSpellCheckLanguage extends React.Component<ExistingSpellChe
     }
 }
 
+@replaceableComponent("views.settings.SpellCheckLanguages")
 export default class SpellCheckLanguages extends React.Component<SpellCheckLanguagesIProps, SpellCheckLanguagesIState> {
     constructor(props) {
         super(props);
diff --git a/src/components/views/settings/account/EmailAddresses.js b/src/components/views/settings/account/EmailAddresses.js
index a8de7693a9..1ebd374173 100644
--- a/src/components/views/settings/account/EmailAddresses.js
+++ b/src/components/views/settings/account/EmailAddresses.js
@@ -25,6 +25,7 @@ import * as Email from "../../../../email";
 import AddThreepid from "../../../../AddThreepid";
 import * as sdk from '../../../../index';
 import Modal from '../../../../Modal';
+import {replaceableComponent} from "../../../../utils/replaceableComponent";
 
 /*
 TODO: Improve the UX for everything in here.
@@ -112,6 +113,7 @@ export class ExistingEmailAddress extends React.Component {
     }
 }
 
+@replaceableComponent("views.settings.account.EmailAddresses")
 export default class EmailAddresses extends React.Component {
     static propTypes = {
         emails: PropTypes.array.isRequired,
diff --git a/src/components/views/settings/account/PhoneNumbers.js b/src/components/views/settings/account/PhoneNumbers.js
index df54b5ca1f..5725fdb909 100644
--- a/src/components/views/settings/account/PhoneNumbers.js
+++ b/src/components/views/settings/account/PhoneNumbers.js
@@ -25,6 +25,7 @@ import AddThreepid from "../../../../AddThreepid";
 import CountryDropdown from "../../auth/CountryDropdown";
 import * as sdk from '../../../../index';
 import Modal from '../../../../Modal';
+import {replaceableComponent} from "../../../../utils/replaceableComponent";
 
 /*
 TODO: Improve the UX for everything in here.
@@ -107,6 +108,7 @@ export class ExistingPhoneNumber extends React.Component {
     }
 }
 
+@replaceableComponent("views.settings.account.PhoneNumbers")
 export default class PhoneNumbers extends React.Component {
     static propTypes = {
         msisdns: PropTypes.array.isRequired,
diff --git a/src/components/views/settings/discovery/EmailAddresses.js b/src/components/views/settings/discovery/EmailAddresses.js
index f9a1ba1818..0493597537 100644
--- a/src/components/views/settings/discovery/EmailAddresses.js
+++ b/src/components/views/settings/discovery/EmailAddresses.js
@@ -23,6 +23,7 @@ import {MatrixClientPeg} from "../../../../MatrixClientPeg";
 import * as sdk from '../../../../index';
 import Modal from '../../../../Modal';
 import AddThreepid from '../../../../AddThreepid';
+import {replaceableComponent} from "../../../../utils/replaceableComponent";
 
 /*
 TODO: Improve the UX for everything in here.
@@ -233,6 +234,7 @@ export class EmailAddress extends React.Component {
     }
 }
 
+@replaceableComponent("views.settings.discovery.EmailAddresses")
 export default class EmailAddresses extends React.Component {
     static propTypes = {
         emails: PropTypes.array.isRequired,
diff --git a/src/components/views/settings/discovery/PhoneNumbers.js b/src/components/views/settings/discovery/PhoneNumbers.js
index 03f459ee15..5cbcdfe47e 100644
--- a/src/components/views/settings/discovery/PhoneNumbers.js
+++ b/src/components/views/settings/discovery/PhoneNumbers.js
@@ -23,6 +23,7 @@ import {MatrixClientPeg} from "../../../../MatrixClientPeg";
 import * as sdk from '../../../../index';
 import Modal from '../../../../Modal';
 import AddThreepid from '../../../../AddThreepid';
+import {replaceableComponent} from "../../../../utils/replaceableComponent";
 
 /*
 TODO: Improve the UX for everything in here.
@@ -246,6 +247,7 @@ export class PhoneNumber extends React.Component {
     }
 }
 
+@replaceableComponent("views.settings.discovery.PhoneNumbers")
 export default class PhoneNumbers extends React.Component {
     static propTypes = {
         msisdns: PropTypes.array.isRequired,
diff --git a/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.js b/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.js
index 2fa61a0ee6..28aad65129 100644
--- a/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.js
+++ b/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.js
@@ -22,7 +22,9 @@ import * as sdk from "../../../../..";
 import AccessibleButton from "../../../elements/AccessibleButton";
 import Modal from "../../../../../Modal";
 import dis from "../../../../../dispatcher/dispatcher";
+import {replaceableComponent} from "../../../../../utils/replaceableComponent";
 
+@replaceableComponent("views.settings.tabs.room.AdvancedRoomSettingsTab")
 export default class AdvancedRoomSettingsTab extends React.Component {
     static propTypes = {
         roomId: PropTypes.string.isRequired,
diff --git a/src/components/views/settings/tabs/room/BridgeSettingsTab.tsx b/src/components/views/settings/tabs/room/BridgeSettingsTab.tsx
index 3c74bd4c1a..8d886a191e 100644
--- a/src/components/views/settings/tabs/room/BridgeSettingsTab.tsx
+++ b/src/components/views/settings/tabs/room/BridgeSettingsTab.tsx
@@ -21,6 +21,7 @@ import {MatrixEvent} from "matrix-js-sdk/src/models/event";
 import {_t} from "../../../../../languageHandler";
 import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
 import BridgeTile from "../../BridgeTile";
+import {replaceableComponent} from "../../../../../utils/replaceableComponent";
 
 const BRIDGE_EVENT_TYPES = [
     "uk.half-shot.bridge",
@@ -33,6 +34,7 @@ interface IProps {
     roomId: string;
 }
 
+@replaceableComponent("views.settings.tabs.room.BridgeSettingsTab")
 export default class BridgeSettingsTab extends React.Component<IProps> {
     private renderBridgeCard(event: MatrixEvent, room: Room) {
         const content = event.getContent();
diff --git a/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js b/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js
index 9b8004d9d6..cd4a043622 100644
--- a/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js
+++ b/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js
@@ -24,7 +24,9 @@ import dis from "../../../../../dispatcher/dispatcher";
 import MatrixClientContext from "../../../../../contexts/MatrixClientContext";
 import SettingsStore from "../../../../../settings/SettingsStore";
 import {UIFeature} from "../../../../../settings/UIFeature";
+import {replaceableComponent} from "../../../../../utils/replaceableComponent";
 
+@replaceableComponent("views.settings.tabs.room.GeneralRoomSettingsTab")
 export default class GeneralRoomSettingsTab extends React.Component {
     static propTypes = {
         roomId: PropTypes.string.isRequired,
diff --git a/src/components/views/settings/tabs/room/NotificationSettingsTab.js b/src/components/views/settings/tabs/room/NotificationSettingsTab.js
index dd88b5018f..baefb5ae20 100644
--- a/src/components/views/settings/tabs/room/NotificationSettingsTab.js
+++ b/src/components/views/settings/tabs/room/NotificationSettingsTab.js
@@ -22,7 +22,9 @@ import AccessibleButton from "../../../elements/AccessibleButton";
 import Notifier from "../../../../../Notifier";
 import SettingsStore from '../../../../../settings/SettingsStore';
 import {SettingLevel} from "../../../../../settings/SettingLevel";
+import {replaceableComponent} from "../../../../../utils/replaceableComponent";
 
+@replaceableComponent("views.settings.tabs.room.NotificationsSettingsTab")
 export default class NotificationsSettingsTab extends React.Component {
     static propTypes = {
         roomId: PropTypes.string.isRequired,
diff --git a/src/components/views/settings/tabs/room/RolesRoomSettingsTab.js b/src/components/views/settings/tabs/room/RolesRoomSettingsTab.js
index 49d683c42a..09498e0d4a 100644
--- a/src/components/views/settings/tabs/room/RolesRoomSettingsTab.js
+++ b/src/components/views/settings/tabs/room/RolesRoomSettingsTab.js
@@ -21,6 +21,7 @@ import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
 import * as sdk from "../../../../..";
 import AccessibleButton from "../../../elements/AccessibleButton";
 import Modal from "../../../../../Modal";
+import {replaceableComponent} from "../../../../../utils/replaceableComponent";
 
 const plEventsToLabels = {
     // These will be translated for us later.
@@ -103,6 +104,7 @@ export class BannedUser extends React.Component {
     }
 }
 
+@replaceableComponent("views.settings.tabs.room.RolesRoomSettingsTab")
 export default class RolesRoomSettingsTab extends React.Component {
     static propTypes = {
         roomId: PropTypes.string.isRequired,
diff --git a/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.js b/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.js
index f72e78fa3f..ce883c6d23 100644
--- a/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.js
+++ b/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.js
@@ -26,7 +26,9 @@ import StyledRadioGroup from '../../../elements/StyledRadioGroup';
 import {SettingLevel} from "../../../../../settings/SettingLevel";
 import SettingsStore from "../../../../../settings/SettingsStore";
 import {UIFeature} from "../../../../../settings/UIFeature";
+import {replaceableComponent} from "../../../../../utils/replaceableComponent";
 
+@replaceableComponent("views.settings.tabs.room.SecurityRoomSettingsTab")
 export default class SecurityRoomSettingsTab extends React.Component {
     static propTypes = {
         roomId: PropTypes.string.isRequired,
diff --git a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
index 80a20d8afa..d6e01d194c 100644
--- a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
@@ -36,6 +36,7 @@ import StyledRadioGroup from "../../../elements/StyledRadioGroup";
 import { SettingLevel } from "../../../../../settings/SettingLevel";
 import {UIFeature} from "../../../../../settings/UIFeature";
 import {Layout} from "../../../../../settings/Layout";
+import {replaceableComponent} from "../../../../../utils/replaceableComponent";
 
 interface IProps {
 }
@@ -64,7 +65,7 @@ interface IState extends IThemeState {
     layout: Layout;
 }
 
-
+@replaceableComponent("views.settings.tabs.user.AppearanceUserSettingsTab")
 export default class AppearanceUserSettingsTab extends React.Component<IProps, IState> {
     private readonly MESSAGE_PREVIEW_TEXT = _t("Hey you. You're the best!");
 
diff --git a/src/components/views/settings/tabs/user/FlairUserSettingsTab.js b/src/components/views/settings/tabs/user/FlairUserSettingsTab.js
index 26e0033233..28e80f3030 100644
--- a/src/components/views/settings/tabs/user/FlairUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/FlairUserSettingsTab.js
@@ -17,7 +17,9 @@ limitations under the License.
 import React from 'react';
 import {_t} from "../../../../../languageHandler";
 import GroupUserSettings from "../../../groups/GroupUserSettings";
+import {replaceableComponent} from "../../../../../utils/replaceableComponent";
 
+@replaceableComponent("views.settings.tabs.user.FlairUserSettingsTab")
 export default class FlairUserSettingsTab extends React.Component {
     render() {
         return (
diff --git a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
index b17ab18c39..314acf5d65 100644
--- a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
@@ -39,7 +39,9 @@ import { getThreepidsWithBindStatus } from '../../../../../boundThreepids';
 import Spinner from "../../../elements/Spinner";
 import {SettingLevel} from "../../../../../settings/SettingLevel";
 import {UIFeature} from "../../../../../settings/UIFeature";
+import {replaceableComponent} from "../../../../../utils/replaceableComponent";
 
+@replaceableComponent("views.settings.tabs.user.GeneralUserSettingsTab")
 export default class GeneralUserSettingsTab extends React.Component {
     static propTypes = {
         closeSettingsFn: PropTypes.func.isRequired,
diff --git a/src/components/views/settings/tabs/user/HelpUserSettingsTab.js b/src/components/views/settings/tabs/user/HelpUserSettingsTab.js
index 85ba22a353..e16ee686f5 100644
--- a/src/components/views/settings/tabs/user/HelpUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/HelpUserSettingsTab.js
@@ -27,7 +27,9 @@ import * as sdk from "../../../../../";
 import PlatformPeg from "../../../../../PlatformPeg";
 import * as KeyboardShortcuts from "../../../../../accessibility/KeyboardShortcuts";
 import UpdateCheckButton from "../../UpdateCheckButton";
+import {replaceableComponent} from "../../../../../utils/replaceableComponent";
 
+@replaceableComponent("views.settings.tabs.user.HelpUserSettingsTab")
 export default class HelpUserSettingsTab extends React.Component {
     static propTypes = {
         closeSettingsFn: PropTypes.func.isRequired,
diff --git a/src/components/views/settings/tabs/user/LabsUserSettingsTab.js b/src/components/views/settings/tabs/user/LabsUserSettingsTab.js
index 91bc9abcad..f515f1862b 100644
--- a/src/components/views/settings/tabs/user/LabsUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/LabsUserSettingsTab.js
@@ -21,6 +21,7 @@ import SettingsStore from "../../../../../settings/SettingsStore";
 import LabelledToggleSwitch from "../../../elements/LabelledToggleSwitch";
 import * as sdk from "../../../../../index";
 import {SettingLevel} from "../../../../../settings/SettingLevel";
+import {replaceableComponent} from "../../../../../utils/replaceableComponent";
 
 export class LabsSettingToggle extends React.Component {
     static propTypes = {
@@ -40,6 +41,7 @@ export class LabsSettingToggle extends React.Component {
     }
 }
 
+@replaceableComponent("views.settings.tabs.user.LabsUserSettingsTab")
 export default class LabsUserSettingsTab extends React.Component {
     constructor() {
         super();
diff --git a/src/components/views/settings/tabs/user/MjolnirUserSettingsTab.js b/src/components/views/settings/tabs/user/MjolnirUserSettingsTab.js
index 510d6076a0..91f6728a7a 100644
--- a/src/components/views/settings/tabs/user/MjolnirUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/MjolnirUserSettingsTab.js
@@ -23,7 +23,9 @@ import {BanList, RULE_SERVER, RULE_USER} from "../../../../../mjolnir/BanList";
 import Modal from "../../../../../Modal";
 import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
 import * as sdk from "../../../../../index";
+import {replaceableComponent} from "../../../../../utils/replaceableComponent";
 
+@replaceableComponent("views.settings.tabs.user.MjolnirUserSettingsTab")
 export default class MjolnirUserSettingsTab extends React.Component {
     constructor() {
         super();
diff --git a/src/components/views/settings/tabs/user/NotificationUserSettingsTab.js b/src/components/views/settings/tabs/user/NotificationUserSettingsTab.js
index 2e649cb7f8..8a71d1bf15 100644
--- a/src/components/views/settings/tabs/user/NotificationUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/NotificationUserSettingsTab.js
@@ -17,7 +17,9 @@ limitations under the License.
 import React from 'react';
 import {_t} from "../../../../../languageHandler";
 import * as sdk from "../../../../../index";
+import {replaceableComponent} from "../../../../../utils/replaceableComponent";
 
+@replaceableComponent("views.settings.tabs.user.NotificationUserSettingsTab")
 export default class NotificationUserSettingsTab extends React.Component {
     constructor() {
         super();
diff --git a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
index ae9cad4cfa..238f875e22 100644
--- a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
@@ -23,7 +23,9 @@ import Field from "../../../elements/Field";
 import * as sdk from "../../../../..";
 import PlatformPeg from "../../../../../PlatformPeg";
 import {SettingLevel} from "../../../../../settings/SettingLevel";
+import {replaceableComponent} from "../../../../../utils/replaceableComponent";
 
+@replaceableComponent("views.settings.tabs.user.PreferencesUserSettingsTab")
 export default class PreferencesUserSettingsTab extends React.Component {
     static ROOM_LIST_SETTINGS = [
         'breadcrumbs',
diff --git a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
index a0d9016ce2..8a70811399 100644
--- a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
@@ -34,6 +34,7 @@ import SettingsStore from "../../../../../settings/SettingsStore";
 import {UIFeature} from "../../../../../settings/UIFeature";
 import {isE2eAdvancedPanelPossible} from "../../E2eAdvancedPanel";
 import CountlyAnalytics from "../../../../../CountlyAnalytics";
+import {replaceableComponent} from "../../../../../utils/replaceableComponent";
 
 export class IgnoredUser extends React.Component {
     static propTypes = {
@@ -59,6 +60,7 @@ export class IgnoredUser extends React.Component {
     }
 }
 
+@replaceableComponent("views.settings.tabs.user.SecurityUserSettingsTab")
 export default class SecurityUserSettingsTab extends React.Component {
     static propTypes = {
         closeSettingsFn: PropTypes.func.isRequired,
diff --git a/src/components/views/settings/tabs/user/VoiceUserSettingsTab.js b/src/components/views/settings/tabs/user/VoiceUserSettingsTab.js
index a78cc10b92..bc6fe796b8 100644
--- a/src/components/views/settings/tabs/user/VoiceUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/VoiceUserSettingsTab.js
@@ -25,7 +25,9 @@ import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
 import * as sdk from "../../../../../index";
 import Modal from "../../../../../Modal";
 import {SettingLevel} from "../../../../../settings/SettingLevel";
+import {replaceableComponent} from "../../../../../utils/replaceableComponent";
 
+@replaceableComponent("views.settings.tabs.user.VoiceUserSettingsTab")
 export default class VoiceUserSettingsTab extends React.Component {
     constructor() {
         super();
diff --git a/src/components/views/terms/InlineTermsAgreement.js b/src/components/views/terms/InlineTermsAgreement.js
index 5f6e276976..473a97642c 100644
--- a/src/components/views/terms/InlineTermsAgreement.js
+++ b/src/components/views/terms/InlineTermsAgreement.js
@@ -20,7 +20,9 @@ import {_t, pickBestLanguage} from "../../../languageHandler";
 import * as sdk from "../../..";
 import {objectClone} from "../../../utils/objects";
 import StyledCheckbox from "../elements/StyledCheckbox";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.terms.InlineTermsAgreement")
 export default class InlineTermsAgreement extends React.Component {
     static propTypes = {
         policiesAndServicePairs: PropTypes.array.isRequired, // array of service/policy pairs
diff --git a/src/components/views/toasts/NonUrgentEchoFailureToast.tsx b/src/components/views/toasts/NonUrgentEchoFailureToast.tsx
index 76d0328e8b..abf5b10692 100644
--- a/src/components/views/toasts/NonUrgentEchoFailureToast.tsx
+++ b/src/components/views/toasts/NonUrgentEchoFailureToast.tsx
@@ -19,7 +19,9 @@ import { _t } from "../../../languageHandler";
 import AccessibleButton from "../elements/AccessibleButton";
 import Modal from "../../../Modal";
 import ServerOfflineDialog from "../dialogs/ServerOfflineDialog";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.toasts.NonUrgentEchoFailureToast")
 export default class NonUrgentEchoFailureToast extends React.PureComponent {
     private openDialog = () => {
         Modal.createTrackedDialog('Local Echo Server Error', '', ServerOfflineDialog, {});
diff --git a/src/components/views/toasts/VerificationRequestToast.tsx b/src/components/views/toasts/VerificationRequestToast.tsx
index 8c8a74b2be..010c8fd12f 100644
--- a/src/components/views/toasts/VerificationRequestToast.tsx
+++ b/src/components/views/toasts/VerificationRequestToast.tsx
@@ -29,6 +29,7 @@ import GenericToast from "./GenericToast";
 import {VerificationRequest} from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
 import {DeviceInfo} from "matrix-js-sdk/src/crypto/deviceinfo";
 import {Action} from "../../../dispatcher/actions";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 interface IProps {
     toastKey: string;
@@ -40,6 +41,7 @@ interface IState {
     device?: DeviceInfo;
 }
 
+@replaceableComponent("views.toasts.VerificationRequestToast")
 export default class VerificationRequestToast extends React.PureComponent<IProps, IState> {
     private intervalHandle: NodeJS.Timeout;
 
diff --git a/src/components/views/verification/VerificationCancelled.js b/src/components/views/verification/VerificationCancelled.js
index fc2a287359..0bbaea1804 100644
--- a/src/components/views/verification/VerificationCancelled.js
+++ b/src/components/views/verification/VerificationCancelled.js
@@ -18,7 +18,9 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.verification.VerificationCancelled")
 export default class VerificationCancelled extends React.Component {
     static propTypes = {
         onDone: PropTypes.func.isRequired,
diff --git a/src/components/views/verification/VerificationComplete.js b/src/components/views/verification/VerificationComplete.js
index 2214711b1f..cf2a72591c 100644
--- a/src/components/views/verification/VerificationComplete.js
+++ b/src/components/views/verification/VerificationComplete.js
@@ -18,7 +18,9 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
+@replaceableComponent("views.verification.VerificationComplete")
 export default class VerificationComplete extends React.Component {
     static propTypes = {
         onDone: PropTypes.func.isRequired,
diff --git a/src/components/views/verification/VerificationShowSas.js b/src/components/views/verification/VerificationShowSas.js
index 09374b91af..36f99b2140 100644
--- a/src/components/views/verification/VerificationShowSas.js
+++ b/src/components/views/verification/VerificationShowSas.js
@@ -21,11 +21,13 @@ import {PendingActionSpinner} from "../right_panel/EncryptionInfo";
 import AccessibleButton from "../elements/AccessibleButton";
 import DialogButtons from "../elements/DialogButtons";
 import { fixupColorFonts } from '../../../utils/FontManager';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 function capFirst(s) {
     return s.charAt(0).toUpperCase() + s.slice(1);
 }
 
+@replaceableComponent("views.verification.VerificationShowSas")
 export default class VerificationShowSas extends React.Component {
     static propTypes = {
         pending: PropTypes.bool,
diff --git a/src/components/views/voip/CallContainer.tsx b/src/components/views/voip/CallContainer.tsx
index 51925cb147..9d0047fc54 100644
--- a/src/components/views/voip/CallContainer.tsx
+++ b/src/components/views/voip/CallContainer.tsx
@@ -17,6 +17,7 @@ limitations under the License.
 import React from 'react';
 import IncomingCallBox from './IncomingCallBox';
 import CallPreview from './CallPreview';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 interface IProps {
 
@@ -26,6 +27,7 @@ interface IState {
 
 }
 
+@replaceableComponent("views.voip.CallContainer")
 export default class CallContainer extends React.PureComponent<IProps, IState> {
     public render() {
         return <div className="mx_CallContainer">
diff --git a/src/components/views/voip/CallPreview.tsx b/src/components/views/voip/CallPreview.tsx
index c08e52181b..29de068b0c 100644
--- a/src/components/views/voip/CallPreview.tsx
+++ b/src/components/views/voip/CallPreview.tsx
@@ -26,6 +26,7 @@ import PersistentApp from "../elements/PersistentApp";
 import SettingsStore from "../../../settings/SettingsStore";
 import { CallEvent, CallState, MatrixCall } from 'matrix-js-sdk/src/webrtc/call';
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 const SHOW_CALL_IN_STATES = [
     CallState.Connected,
@@ -85,6 +86,7 @@ function getPrimarySecondaryCalls(calls: MatrixCall[]): [MatrixCall, MatrixCall[
  * CallPreview shows a small version of CallView hovering over the UI in 'picture-in-picture'
  * (PiP mode). It displays the call(s) which is *not* in the room the user is currently viewing.
  */
+@replaceableComponent("views.voip.CallPreview")
 export default class CallPreview extends React.Component<IProps, IState> {
     private roomStoreToken: any;
     private dispatcherRef: string;
diff --git a/src/components/views/voip/CallView.tsx b/src/components/views/voip/CallView.tsx
index 7cac682794..9bdc8fb11d 100644
--- a/src/components/views/voip/CallView.tsx
+++ b/src/components/views/voip/CallView.tsx
@@ -31,6 +31,7 @@ import {alwaysAboveLeftOf, alwaysAboveRightOf, ChevronFace, ContextMenuButton} f
 import CallContextMenu from '../context_menus/CallContextMenu';
 import { avatarUrlForMember } from '../../../Avatar';
 import DialpadContextMenu from '../context_menus/DialpadContextMenu';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 interface IProps {
         // The call for us to display
@@ -100,6 +101,7 @@ const BOTTOM_PADDING = 10;
 const BOTTOM_MARGIN_TOP_BOTTOM = 10; // top margin plus bottom margin
 const CONTEXT_MENU_VPADDING = 8; // How far the context menu sits above the button (px)
 
+@replaceableComponent("views.voip.CallView")
 export default class CallView extends React.Component<IProps, IState> {
     private dispatcherRef: string;
     private contentRef = createRef<HTMLDivElement>();
diff --git a/src/components/views/voip/CallViewForRoom.tsx b/src/components/views/voip/CallViewForRoom.tsx
index 4cb4e66fbe..97960d1e0b 100644
--- a/src/components/views/voip/CallViewForRoom.tsx
+++ b/src/components/views/voip/CallViewForRoom.tsx
@@ -19,6 +19,7 @@ import React from 'react';
 import CallHandler from '../../../CallHandler';
 import CallView from './CallView';
 import dis from '../../../dispatcher/dispatcher';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 interface IProps {
     // What room we should display the call for
@@ -40,6 +41,7 @@ interface IState {
  * Wrapper for CallView that always display the call in a given room,
  * or nothing if there is no call in that room.
  */
+@replaceableComponent("views.voip.CallViewForRoom")
 export default class CallViewForRoom extends React.Component<IProps, IState> {
     private dispatcherRef: string;
 
diff --git a/src/components/views/voip/DialPad.tsx b/src/components/views/voip/DialPad.tsx
index da88f49adf..3598f511f5 100644
--- a/src/components/views/voip/DialPad.tsx
+++ b/src/components/views/voip/DialPad.tsx
@@ -16,6 +16,7 @@ limitations under the License.
 
 import * as React from "react";
 import AccessibleButton from "../elements/AccessibleButton";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 const BUTTONS = ['1', '2', '3', '4', '5', '6', '7', '8', '9', '*', '0', '#'];
 
@@ -59,6 +60,7 @@ interface IProps {
     onDialPress?: (string) => void;
 }
 
+@replaceableComponent("views.voip.Dialpad")
 export default class Dialpad extends React.PureComponent<IProps> {
     render() {
         const buttonNodes = [];
diff --git a/src/components/views/voip/DialPadModal.tsx b/src/components/views/voip/DialPadModal.tsx
index 9f031a48a3..c085809d5a 100644
--- a/src/components/views/voip/DialPadModal.tsx
+++ b/src/components/views/voip/DialPadModal.tsx
@@ -25,6 +25,7 @@ import dis from '../../../dispatcher/dispatcher';
 import Modal from "../../../Modal";
 import ErrorDialog from "../../views/dialogs/ErrorDialog";
 import CallHandler from "../../../CallHandler";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 interface IProps {
     onFinished: (boolean) => void;
@@ -34,6 +35,7 @@ interface IState {
     value: string;
 }
 
+@replaceableComponent("views.voip.DialpadModal")
 export default class DialpadModal extends React.PureComponent<IProps, IState> {
     constructor(props) {
         super(props);
diff --git a/src/components/views/voip/IncomingCallBox.tsx b/src/components/views/voip/IncomingCallBox.tsx
index a495093d85..0ca2a196c2 100644
--- a/src/components/views/voip/IncomingCallBox.tsx
+++ b/src/components/views/voip/IncomingCallBox.tsx
@@ -25,6 +25,7 @@ import CallHandler from '../../../CallHandler';
 import RoomAvatar from '../avatars/RoomAvatar';
 import FormButton from '../elements/FormButton';
 import { CallState } from 'matrix-js-sdk/src/webrtc/call';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 interface IProps {
 }
@@ -33,6 +34,7 @@ interface IState {
     incomingCall: any;
 }
 
+@replaceableComponent("views.voip.IncomingCallBox")
 export default class IncomingCallBox extends React.Component<IProps, IState> {
     private dispatcherRef: string;
 
diff --git a/src/components/views/voip/VideoFeed.tsx b/src/components/views/voip/VideoFeed.tsx
index 5210f28eb1..23dbe4d46b 100644
--- a/src/components/views/voip/VideoFeed.tsx
+++ b/src/components/views/voip/VideoFeed.tsx
@@ -18,6 +18,7 @@ import classnames from 'classnames';
 import { MatrixCall } from 'matrix-js-sdk/src/webrtc/call';
 import React, {createRef} from 'react';
 import SettingsStore from "../../../settings/SettingsStore";
+import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 export enum VideoFeedType {
     Local,
@@ -37,6 +38,7 @@ interface IProps {
     onResize?: (e: Event) => void,
 }
 
+@replaceableComponent("views.voip.VideoFeed")
 export default class VideoFeed extends React.Component<IProps> {
     private vid = createRef<HTMLVideoElement>();
 

From 591ccabab91e0ab5d30cc23acaca56c01c57858a Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 8 Mar 2021 20:26:08 -0700
Subject: [PATCH 226/420] Remove a bunch of useless 'use strict' definitions

---
 src/components/structures/EmbeddedPage.js         | 2 --
 src/components/views/auth/AuthBody.js             | 2 --
 src/components/views/auth/AuthHeaderLogo.js       | 2 --
 src/components/views/auth/CompleteSecurityBody.js | 2 --
 src/components/views/elements/Flair.js            | 2 --
 src/components/views/messages/MAudioBody.js       | 2 --
 src/notifications/VectorPushRulesDefinitions.js   | 2 --
 src/notifications/index.js                        | 2 --
 src/utils/MegolmExportEncryption.js               | 2 --
 test/test-utils.js                                | 2 --
 test/utils/MegolmExportEncryption-test.js         | 2 --
 11 files changed, 22 deletions(-)

diff --git a/src/components/structures/EmbeddedPage.js b/src/components/structures/EmbeddedPage.js
index cbfeff7582..c37ab3df48 100644
--- a/src/components/structures/EmbeddedPage.js
+++ b/src/components/structures/EmbeddedPage.js
@@ -16,8 +16,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-'use strict';
-
 import React from 'react';
 import PropTypes from 'prop-types';
 import request from 'browser-request';
diff --git a/src/components/views/auth/AuthBody.js b/src/components/views/auth/AuthBody.js
index 9a078efb52..7881486a5f 100644
--- a/src/components/views/auth/AuthBody.js
+++ b/src/components/views/auth/AuthBody.js
@@ -14,8 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-'use strict';
-
 import React from 'react';
 
 export default class AuthBody extends React.PureComponent {
diff --git a/src/components/views/auth/AuthHeaderLogo.js b/src/components/views/auth/AuthHeaderLogo.js
index 9edf149a83..2f27885322 100644
--- a/src/components/views/auth/AuthHeaderLogo.js
+++ b/src/components/views/auth/AuthHeaderLogo.js
@@ -14,8 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-'use strict';
-
 import React from 'react';
 
 export default class AuthHeaderLogo extends React.PureComponent {
diff --git a/src/components/views/auth/CompleteSecurityBody.js b/src/components/views/auth/CompleteSecurityBody.js
index d757de9fe0..734af3192c 100644
--- a/src/components/views/auth/CompleteSecurityBody.js
+++ b/src/components/views/auth/CompleteSecurityBody.js
@@ -14,8 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-'use strict';
-
 import React from 'react';
 
 export default class CompleteSecurityBody extends React.PureComponent {
diff --git a/src/components/views/elements/Flair.js b/src/components/views/elements/Flair.js
index 0f06904b68..645444b300 100644
--- a/src/components/views/elements/Flair.js
+++ b/src/components/views/elements/Flair.js
@@ -14,8 +14,6 @@
  limitations under the License.
  */
 
-'use strict';
-
 import React from 'react';
 import PropTypes from 'prop-types';
 import FlairStore from '../../../stores/FlairStore';
diff --git a/src/components/views/messages/MAudioBody.js b/src/components/views/messages/MAudioBody.js
index 587dee4513..ac42b485d7 100644
--- a/src/components/views/messages/MAudioBody.js
+++ b/src/components/views/messages/MAudioBody.js
@@ -14,8 +14,6 @@
  limitations under the License.
  */
 
-'use strict';
-
 import React from 'react';
 import MFileBody from './MFileBody';
 
diff --git a/src/notifications/VectorPushRulesDefinitions.js b/src/notifications/VectorPushRulesDefinitions.js
index 98d197a004..c049a81c15 100644
--- a/src/notifications/VectorPushRulesDefinitions.js
+++ b/src/notifications/VectorPushRulesDefinitions.js
@@ -15,8 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-'use strict';
-
 import { _td } from '../languageHandler';
 import {StandardActions} from "./StandardActions";
 import {PushRuleVectorState} from "./PushRuleVectorState";
diff --git a/src/notifications/index.js b/src/notifications/index.js
index 7c400ad8b3..96c176303b 100644
--- a/src/notifications/index.js
+++ b/src/notifications/index.js
@@ -15,8 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-'use strict';
-
 export * from "./NotificationUtils";
 export * from "./PushRuleVectorState";
 export * from "./VectorPushRulesDefinitions";
diff --git a/src/utils/MegolmExportEncryption.js b/src/utils/MegolmExportEncryption.js
index cde20a0eb2..be7472901a 100644
--- a/src/utils/MegolmExportEncryption.js
+++ b/src/utils/MegolmExportEncryption.js
@@ -15,8 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-"use strict";
-
 // polyfill textencoder if necessary
 import * as TextEncodingUtf8 from 'text-encoding-utf-8';
 let TextEncoder = window.TextEncoder;
diff --git a/test/test-utils.js b/test/test-utils.js
index 839e1d6cd8..b6e0468d86 100644
--- a/test/test-utils.js
+++ b/test/test-utils.js
@@ -1,5 +1,3 @@
-"use strict";
-
 import React from 'react';
 import {MatrixClientPeg as peg} from '../src/MatrixClientPeg';
 import dis from '../src/dispatcher/dispatcher';
diff --git a/test/utils/MegolmExportEncryption-test.js b/test/utils/MegolmExportEncryption-test.js
index 1fd305b0a6..e0ed5ba26a 100644
--- a/test/utils/MegolmExportEncryption-test.js
+++ b/test/utils/MegolmExportEncryption-test.js
@@ -14,8 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-"use strict";
-
 import {TextEncoder} from "util";
 import nodeCrypto from "crypto";
 import { Crypto } from "@peculiar/webcrypto";

From 81e1f36c4b3a0b5a260da20f9b84e91083d4f302 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 8 Mar 2021 17:48:08 +0000
Subject: [PATCH 227/420] Tidy up TemporaryTile now that it isn't temporary

---
 .../views/avatars/_DecoratedRoomAvatar.scss   |  3 +--
 .../{TemporaryTile.tsx => ExtraTile.tsx}      |  7 +++--
 src/components/views/rooms/RoomList.tsx       | 14 +++++-----
 src/components/views/rooms/RoomSublist.tsx    | 26 +++++++++----------
 4 files changed, 23 insertions(+), 27 deletions(-)
 rename src/components/views/rooms/{TemporaryTile.tsx => ExtraTile.tsx} (92%)

diff --git a/res/css/views/avatars/_DecoratedRoomAvatar.scss b/res/css/views/avatars/_DecoratedRoomAvatar.scss
index e0afd9de66..2631cbfb40 100644
--- a/res/css/views/avatars/_DecoratedRoomAvatar.scss
+++ b/res/css/views/avatars/_DecoratedRoomAvatar.scss
@@ -14,8 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// XXX: We shouldn't be using TemporaryTile anywhere - delete it.
-.mx_DecoratedRoomAvatar, .mx_TemporaryTile {
+.mx_DecoratedRoomAvatar, .mx_ExtraTile {
     position: relative;
 
     &.mx_DecoratedRoomAvatar_cutout .mx_BaseAvatar {
diff --git a/src/components/views/rooms/TemporaryTile.tsx b/src/components/views/rooms/ExtraTile.tsx
similarity index 92%
rename from src/components/views/rooms/TemporaryTile.tsx
rename to src/components/views/rooms/ExtraTile.tsx
index 31d2acbc61..20d12955d5 100644
--- a/src/components/views/rooms/TemporaryTile.tsx
+++ b/src/components/views/rooms/ExtraTile.tsx
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Matrix.org Foundation C.I.C.
+Copyright 2020, 2021 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -36,8 +36,7 @@ interface IState {
     hover: boolean;
 }
 
-// TODO: Remove with community invites in the room list: https://github.com/vector-im/element-web/issues/14456
-export default class TemporaryTile extends React.Component<IProps, IState> {
+export default class ExtraTile extends React.Component<IProps, IState> {
     constructor(props: IProps) {
         super(props);
 
@@ -57,8 +56,8 @@ export default class TemporaryTile extends React.Component<IProps, IState> {
     public render(): React.ReactElement {
         // XXX: We copy classes because it's easier
         const classes = classNames({
+            'mx_ExtraTile': true,
             'mx_RoomTile': true,
-            'mx_TemporaryTile': true,
             'mx_RoomTile_selected': this.props.isSelected,
             'mx_RoomTile_minimized': this.props.isMinimized,
         });
diff --git a/src/components/views/rooms/RoomList.tsx b/src/components/views/rooms/RoomList.tsx
index beb85e50ce..7b44647be6 100644
--- a/src/components/views/rooms/RoomList.tsx
+++ b/src/components/views/rooms/RoomList.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, { ReactComponentElement } from "react";
 import { Dispatcher } from "flux";
 import { Room } from "matrix-js-sdk/src/models/room";
 import * as fbEmitter from "fbemitter";
@@ -34,7 +34,7 @@ import RoomSublist from "./RoomSublist";
 import { ActionPayload } from "../../../dispatcher/payloads";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import GroupAvatar from "../avatars/GroupAvatar";
-import TemporaryTile from "./TemporaryTile";
+import ExtraTile from "./ExtraTile";
 import { StaticNotificationState } from "../../../stores/notifications/StaticNotificationState";
 import { NotificationColor } from "../../../stores/notifications/NotificationColor";
 import { Action } from "../../../dispatcher/actions";
@@ -422,7 +422,7 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
         dis.dispatch({ action: Action.ViewRoomDirectory, initialText });
     };
 
-    private renderSuggestedRooms(): JSX.Element[] {
+    private renderSuggestedRooms(): ReactComponentElement<typeof ExtraTile>[] {
         return this.state.suggestedRooms.map(room => {
             const name = room.name || room.canonical_alias || room.aliases.pop() || _t("Empty room");
             const avatar = (
@@ -443,7 +443,7 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
                 });
             };
             return (
-                <TemporaryTile
+                <ExtraTile
                     isMinimized={this.props.isMinimized}
                     isSelected={this.state.currentRoomId === room.room_id}
                     displayName={name}
@@ -455,7 +455,7 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
         });
     }
 
-    private renderCommunityInvites(): TemporaryTile[] {
+    private renderCommunityInvites(): ReactComponentElement<typeof ExtraTile>[] {
         // TODO: Put community invites in a more sensible place (not in the room list)
         // See https://github.com/vector-im/element-web/issues/14456
         return MatrixClientPeg.get().getGroups().filter(g => {
@@ -476,7 +476,7 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
                 });
             };
             return (
-                <TemporaryTile
+                <ExtraTile
                     isMinimized={this.props.isMinimized}
                     isSelected={false}
                     displayName={g.name}
@@ -538,7 +538,7 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
                 isMinimized={this.props.isMinimized}
                 onResize={this.props.onResize}
                 showSkeleton={showSkeleton}
-                extraBadTilesThatShouldntExist={extraTiles}
+                extraTiles={extraTiles}
             />);
         }
 
diff --git a/src/components/views/rooms/RoomSublist.tsx b/src/components/views/rooms/RoomSublist.tsx
index a2574bf60c..1a9ff182bc 100644
--- a/src/components/views/rooms/RoomSublist.tsx
+++ b/src/components/views/rooms/RoomSublist.tsx
@@ -17,7 +17,7 @@ limitations under the License.
 */
 
 import * as React from "react";
-import {createRef} from "react";
+import { createRef, ReactComponentElement } from "react";
 import { Room } from "matrix-js-sdk/src/models/room";
 import classNames from 'classnames';
 import { RovingAccessibleButton, RovingTabIndexWrapper } from "../../../accessibility/RovingTabIndex";
@@ -48,7 +48,7 @@ import { RoomNotificationStateStore } from "../../../stores/notifications/RoomNo
 import RoomListLayoutStore from "../../../stores/room-list/RoomListLayoutStore";
 import { arrayFastClone, arrayHasOrderChange } from "../../../utils/arrays";
 import { objectExcluding, objectHasDiff } from "../../../utils/objects";
-import TemporaryTile from "./TemporaryTile";
+import ExtraTile from "./ExtraTile";
 import { ListNotificationState } from "../../../stores/notifications/ListNotificationState";
 import IconizedContextMenu from "../context_menus/IconizedContextMenu";
 
@@ -73,9 +73,7 @@ interface IProps {
     onResize: () => void;
     showSkeleton?: boolean;
 
-    // TODO: Don't use this. It's for community invites, and community invites shouldn't be here.
-    // You should feel bad if you use this.
-    extraBadTilesThatShouldntExist?: TemporaryTile[];
+    extraTiles?: ReactComponentElement<typeof ExtraTile>[];
 
     // TODO: Account for https://github.com/vector-im/element-web/issues/14179
 }
@@ -95,7 +93,7 @@ interface IState {
     isExpanded: boolean; // used for the for expand of the sublist when the room list is being filtered
     height: number;
     rooms: Room[];
-    filteredExtraTiles?: TemporaryTile[];
+    filteredExtraTiles?: ReactComponentElement<typeof ExtraTile>[];
 }
 
 export default class RoomSublist extends React.Component<IProps, IState> {
@@ -153,12 +151,12 @@ export default class RoomSublist extends React.Component<IProps, IState> {
         return padding;
     }
 
-    private get extraTiles(): TemporaryTile[] | null {
+    private get extraTiles(): ReactComponentElement<typeof ExtraTile>[] | null {
         if (this.state.filteredExtraTiles) {
             return this.state.filteredExtraTiles;
         }
-        if (this.props.extraBadTilesThatShouldntExist) {
-            return this.props.extraBadTilesThatShouldntExist;
+        if (this.props.extraTiles) {
+            return this.props.extraTiles;
         }
         return null;
     }
@@ -177,7 +175,7 @@ export default class RoomSublist extends React.Component<IProps, IState> {
     }
 
     public componentDidUpdate(prevProps: Readonly<IProps>, prevState: Readonly<IState>) {
-        const prevExtraTiles = prevState.filteredExtraTiles || prevProps.extraBadTilesThatShouldntExist;
+        const prevExtraTiles = prevState.filteredExtraTiles || prevProps.extraTiles;
         // as the rooms can come in one by one we need to reevaluate
         // the amount of available rooms to cap the amount of requested visible rooms by the layout
         if (RoomSublist.calcNumTiles(prevState.rooms, prevExtraTiles) !== this.numTiles) {
@@ -200,8 +198,8 @@ export default class RoomSublist extends React.Component<IProps, IState> {
 
         // If we're supposed to handle extra tiles, take the performance hit and re-render all the
         // time so we don't have to consider them as part of the visible room optimization.
-        const prevExtraTiles = this.props.extraBadTilesThatShouldntExist || [];
-        const nextExtraTiles = (nextState.filteredExtraTiles || nextProps.extraBadTilesThatShouldntExist) || [];
+        const prevExtraTiles = this.props.extraTiles || [];
+        const nextExtraTiles = (nextState.filteredExtraTiles || nextProps.extraTiles) || [];
         if (prevExtraTiles.length > 0 || nextExtraTiles.length > 0) {
             return true;
         }
@@ -249,10 +247,10 @@ export default class RoomSublist extends React.Component<IProps, IState> {
     private onListsUpdated = () => {
         const stateUpdates: IState & any = {}; // &any is to avoid a cast on the initializer
 
-        if (this.props.extraBadTilesThatShouldntExist) {
+        if (this.props.extraTiles) {
             const nameCondition = RoomListStore.instance.getFirstNameFilterCondition();
             if (nameCondition) {
-                stateUpdates.filteredExtraTiles = this.props.extraBadTilesThatShouldntExist
+                stateUpdates.filteredExtraTiles = this.props.extraTiles
                     .filter(t => nameCondition.matches(t.props.displayName || ""));
             } else if (this.state.filteredExtraTiles) {
                 stateUpdates.filteredExtraTiles = null;

From 0936ea7e640ac10449150eaed1615bc99c52e70c Mon Sep 17 00:00:00 2001
From: Panagiotis <27917356+panoschal@users.noreply.github.com>
Date: Tue, 9 Mar 2021 14:46:37 +0200
Subject: [PATCH 228/420] feat: show edit button only when user has permissions

call appropriate functions for state events and edit message events
---
 src/components/structures/ViewSource.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/ViewSource.js b/src/components/structures/ViewSource.js
index cfe28e9f73..39666edd65 100644
--- a/src/components/structures/ViewSource.js
+++ b/src/components/structures/ViewSource.js
@@ -24,6 +24,7 @@ import * as sdk from "../../index";
 import MatrixClientContext from "../../contexts/MatrixClientContext";
 import { SendCustomEvent } from "../views/dialogs/DevtoolsDialog";
 import { canEditContent } from "../../utils/EventUtils";
+import { MatrixClientPeg } from '../../MatrixClientPeg';
 
 export default class ViewSource extends React.Component {
     static propTypes = {
@@ -156,6 +157,12 @@ export default class ViewSource extends React.Component {
         }
     }
 
+    canSendStateEvent(mxEvent) {
+        const cli = MatrixClientPeg.get();
+        const room = cli.getRoom(mxEvent.getRoomId());
+        return room.currentState.mayClientSendStateEvent(mxEvent.getType(), cli);
+    }
+
     render() {
         const BaseDialog = sdk.getComponent("views.dialogs.BaseDialog");
         const mxEvent = this.props.mxEvent.replacingEvent() || this.props.mxEvent; // show the replacing event, not the original, if it is an edit
@@ -163,7 +170,7 @@ export default class ViewSource extends React.Component {
         const isEditing = this.state.isEditing;
         const roomId = mxEvent.getRoomId();
         const eventId = mxEvent.getId();
-        const canEdit = canEditContent(this.props.mxEvent) || mxEvent.isState();
+        const canEdit = mxEvent.isState() ? this.canSendStateEvent(mxEvent) : canEditContent(this.props.mxEvent);
         return (
             <BaseDialog className="mx_ViewSource" onFinished={this.props.onFinished} title={_t("View Source")}>
                 <div>

From 41c87c757028ad00da4b4850374843d1661da00a Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Tue, 9 Mar 2021 13:35:42 +0000
Subject: [PATCH 229/420] remove obsolete comment

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

diff --git a/src/stores/SetupEncryptionStore.js b/src/stores/SetupEncryptionStore.js
index 28ab76edc0..3839f27a77 100644
--- a/src/stores/SetupEncryptionStore.js
+++ b/src/stores/SetupEncryptionStore.js
@@ -97,7 +97,6 @@ export class SetupEncryptionStore extends EventEmitter {
 
         if (!this.hasDevicesToVerifyAgainst && !this.keyInfo) {
             // skip before we can even render anything.
-            // XXX: this causes a dialog box flash
             this.phase = PHASE_FINISHED;
         } else {
             this.phase = PHASE_INTRO;

From dd0b0834e68e7f96c683604d23c06b94f0575f6c Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 9 Mar 2021 13:40:48 +0000
Subject: [PATCH 230/420] Fix React warning

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

diff --git a/src/components/views/dialogs/InfoDialog.js b/src/components/views/dialogs/InfoDialog.js
index 6dc9fc01b0..8207d334d3 100644
--- a/src/components/views/dialogs/InfoDialog.js
+++ b/src/components/views/dialogs/InfoDialog.js
@@ -27,7 +27,7 @@ export default class InfoDialog extends React.Component {
         className: PropTypes.string,
         title: PropTypes.string,
         description: PropTypes.node,
-        button: PropTypes.oneOfType(PropTypes.string, PropTypes.bool),
+        button: PropTypes.oneOfType([PropTypes.string, PropTypes.bool]),
         onFinished: PropTypes.func,
         hasCloseButton: PropTypes.bool,
         onKeyDown: PropTypes.func,

From cf2c79069983a525d878e3fc634ead908091a709 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 9 Mar 2021 13:41:06 +0000
Subject: [PATCH 231/420] Pass OOB data for suggested rooms

---
 src/components/views/rooms/RoomList.tsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/components/views/rooms/RoomList.tsx b/src/components/views/rooms/RoomList.tsx
index 7b44647be6..1573945a17 100644
--- a/src/components/views/rooms/RoomList.tsx
+++ b/src/components/views/rooms/RoomList.tsx
@@ -440,6 +440,10 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
                 defaultDispatcher.dispatch({
                     action: "view_room",
                     room_id: room.room_id,
+                    oobData: {
+                        avatarUrl: room.avatar_url,
+                        name,
+                    },
                 });
             };
             return (

From 1cfeb3692716a8ea17a91fc14f1ef7cf756f0454 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 9 Mar 2021 13:41:37 +0000
Subject: [PATCH 232/420] Update suggested room on join

---
 src/stores/SpaceStore.tsx | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/stores/SpaceStore.tsx b/src/stores/SpaceStore.tsx
index 1ada5d6361..d1abc68f4e 100644
--- a/src/stores/SpaceStore.tsx
+++ b/src/stores/SpaceStore.tsx
@@ -355,6 +355,12 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
             // this.onRoomUpdate(room);
             this.onRoomsUpdate();
         }
+
+        const numSuggestedRooms = this._suggestedRooms.length;
+        this._suggestedRooms = this._suggestedRooms.filter(r => r.room_id !== room.roomId);
+        if (numSuggestedRooms !== this._suggestedRooms.length) {
+            this.emit(SUGGESTED_ROOMS, this._suggestedRooms);
+        }
     };
 
     private onRoomState = (ev: MatrixEvent) => {

From e6370a970bc755f5c89ccd5ffc39ea0162800453 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 9 Mar 2021 14:03:58 +0000
Subject: [PATCH 233/420] Tweak call handler stuff to not explode the room list
 on unsupported servers

---
 src/VoipUserMapper.ts                 | 8 +++++---
 src/stores/room-list/RoomListStore.ts | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/VoipUserMapper.ts b/src/VoipUserMapper.ts
index d919615349..4f5613b4a8 100644
--- a/src/VoipUserMapper.ts
+++ b/src/VoipUserMapper.ts
@@ -37,7 +37,7 @@ export default class VoipUserMapper {
         return results[0].userid;
     }
 
-    public async getOrCreateVirtualRoomForRoom(roomId: string):Promise<string> {
+    public async getOrCreateVirtualRoomForRoom(roomId: string): Promise<string> {
         const userId = DMRoomMap.shared().getUserIdForRoomId(roomId);
         if (!userId) return null;
 
@@ -52,7 +52,7 @@ export default class VoipUserMapper {
         return virtualRoomId;
     }
 
-    public nativeRoomForVirtualRoom(roomId: string):string {
+    public nativeRoomForVirtualRoom(roomId: string): string {
         const virtualRoom = MatrixClientPeg.get().getRoom(roomId);
         if (!virtualRoom) return null;
         const virtualRoomEvent = virtualRoom.getAccountData(VIRTUAL_ROOM_EVENT_TYPE);
@@ -60,7 +60,7 @@ export default class VoipUserMapper {
         return virtualRoomEvent.getContent()['native_room'] || null;
     }
 
-    public isVirtualRoom(room: Room):boolean {
+    public isVirtualRoom(room: Room): boolean {
         if (this.nativeRoomForVirtualRoom(room.roomId)) return true;
 
         if (this.virtualRoomIdCache.has(room.roomId)) return true;
@@ -79,6 +79,8 @@ export default class VoipUserMapper {
     }
 
     public async onNewInvitedRoom(invitedRoom: Room) {
+        if (!CallHandler.sharedInstance().getSupportsVirtualRooms()) return;
+
         const inviterId = invitedRoom.getDMInviter();
         console.log(`Checking virtual-ness of room ID ${invitedRoom.roomId}, invited by ${inviterId}`);
         const result = await CallHandler.sharedInstance().sipNativeLookup(inviterId);
diff --git a/src/stores/room-list/RoomListStore.ts b/src/stores/room-list/RoomListStore.ts
index 60a960261c..5775e685fd 100644
--- a/src/stores/room-list/RoomListStore.ts
+++ b/src/stores/room-list/RoomListStore.ts
@@ -409,7 +409,7 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
     }
 
     private async handleRoomUpdate(room: Room, cause: RoomUpdateCause): Promise<any> {
-        if (cause === RoomUpdateCause.NewRoom) {
+        if (cause === RoomUpdateCause.NewRoom && room.getMyMembership() === "invite") {
             // Let the visibility provider know that there is a new invited room. It would be nice
             // if this could just be an event that things listen for but the point of this is that
             // we delay doing anything about this room until the VoipUserMapper had had a chance

From 3ac4cb49fc7d2dfaac3c7c775c45f7fe6402d25f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 9 Mar 2021 14:16:29 +0000
Subject: [PATCH 234/420] Tweak styling of manage rooms in space ux

---
 res/css/structures/_SpaceRoomDirectory.scss | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/res/css/structures/_SpaceRoomDirectory.scss b/res/css/structures/_SpaceRoomDirectory.scss
index 5cb91820cf..c96398594f 100644
--- a/res/css/structures/_SpaceRoomDirectory.scss
+++ b/res/css/structures/_SpaceRoomDirectory.scss
@@ -203,8 +203,9 @@ limitations under the License.
         .mx_SpaceRoomDirectory_actions {
             width: 180px;
             text-align: right;
-            height: min-content;
-            margin: auto 0 auto 28px;
+            margin-left: 28px;
+            display: inline-flex;
+            align-items: center;
 
             .mx_AccessibleButton {
                 vertical-align: middle;
@@ -223,9 +224,5 @@ limitations under the License.
             line-height: $font-15px;
             color: $secondary-fg-color;
         }
-
-        .mx_Checkbox {
-            display: inline-block;
-        }
     }
 }

From 71b8959d3c12fca4d5cf88db5d2de215b22bb34a Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 9 Mar 2021 09:36:17 -0700
Subject: [PATCH 235/420] Apply suggestions from code review

Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
---
 src/components/views/rooms/BasicMessageComposer.tsx | 2 +-
 src/components/views/rooms/ForwardMessage.js        | 2 +-
 src/components/views/voip/DialPad.tsx               | 2 +-
 src/components/views/voip/DialPadModal.tsx          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/views/rooms/BasicMessageComposer.tsx b/src/components/views/rooms/BasicMessageComposer.tsx
index 829809ad49..5ab2b82a32 100644
--- a/src/components/views/rooms/BasicMessageComposer.tsx
+++ b/src/components/views/rooms/BasicMessageComposer.tsx
@@ -106,7 +106,7 @@ interface IState {
     completionIndex?: number;
 }
 
-@replaceableComponent("views.rooms.BasixMessageEditor")
+@replaceableComponent("views.rooms.BasicMessageEditor")
 export default class BasicMessageEditor extends React.Component<IProps, IState> {
     private editorRef = createRef<HTMLDivElement>();
     private autocompleteRef = createRef<Autocomplete>();
diff --git a/src/components/views/rooms/ForwardMessage.js b/src/components/views/rooms/ForwardMessage.js
index 222895ef04..dd894c0dcf 100644
--- a/src/components/views/rooms/ForwardMessage.js
+++ b/src/components/views/rooms/ForwardMessage.js
@@ -21,7 +21,7 @@ import { _t } from '../../../languageHandler';
 import {Key} from '../../../Keyboard';
 import {replaceableComponent} from "../../../utils/replaceableComponent";
 
-@replaceableComponent("views.rooms.FowardMessage")
+@replaceableComponent("views.rooms.ForwardMessage")
 export default class ForwardMessage extends React.Component {
     static propTypes = {
         onCancelClick: PropTypes.func.isRequired,
diff --git a/src/components/views/voip/DialPad.tsx b/src/components/views/voip/DialPad.tsx
index 3598f511f5..68092fb0be 100644
--- a/src/components/views/voip/DialPad.tsx
+++ b/src/components/views/voip/DialPad.tsx
@@ -60,7 +60,7 @@ interface IProps {
     onDialPress?: (string) => void;
 }
 
-@replaceableComponent("views.voip.Dialpad")
+@replaceableComponent("views.voip.DialPad")
 export default class Dialpad extends React.PureComponent<IProps> {
     render() {
         const buttonNodes = [];
diff --git a/src/components/views/voip/DialPadModal.tsx b/src/components/views/voip/DialPadModal.tsx
index c085809d5a..cdd5bc6641 100644
--- a/src/components/views/voip/DialPadModal.tsx
+++ b/src/components/views/voip/DialPadModal.tsx
@@ -35,7 +35,7 @@ interface IState {
     value: string;
 }
 
-@replaceableComponent("views.voip.DialpadModal")
+@replaceableComponent("views.voip.DialPadModal")
 export default class DialpadModal extends React.PureComponent<IProps, IState> {
     constructor(props) {
         super(props);

From 375ffafda647a47f9390b272f93b84ca2d8571a0 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 9 Mar 2021 10:13:16 -0700
Subject: [PATCH 236/420] Fix tests failing to load skin

We should find a better way to do this, but this works well enough.
---
 test/accessibility/RovingTabIndex-test.js                        | 1 +
 .../components/views/messages/MKeyVerificationConclusion-test.js | 1 +
 test/components/views/rooms/SendMessageComposer-test.js          | 1 +
 test/createRoom-test.js                                          | 1 +
 test/editor/deserialize-test.js                                  | 1 +
 5 files changed, 5 insertions(+)

diff --git a/test/accessibility/RovingTabIndex-test.js b/test/accessibility/RovingTabIndex-test.js
index 8be4a2976c..5aa93f99f3 100644
--- a/test/accessibility/RovingTabIndex-test.js
+++ b/test/accessibility/RovingTabIndex-test.js
@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import '../skinned-sdk'; // Must be first for skinning to work
 import React from "react";
 import Adapter from "enzyme-adapter-react-16";
 import { configure, mount } from "enzyme";
diff --git a/test/components/views/messages/MKeyVerificationConclusion-test.js b/test/components/views/messages/MKeyVerificationConclusion-test.js
index 689151fe3f..45e122295b 100644
--- a/test/components/views/messages/MKeyVerificationConclusion-test.js
+++ b/test/components/views/messages/MKeyVerificationConclusion-test.js
@@ -1,3 +1,4 @@
+import '../../../skinned-sdk'; // Must be first for skinning to work
 import React from 'react';
 import TestRenderer from 'react-test-renderer';
 import { EventEmitter } from 'events';
diff --git a/test/components/views/rooms/SendMessageComposer-test.js b/test/components/views/rooms/SendMessageComposer-test.js
index 6eeac7ceea..64a90eee81 100644
--- a/test/components/views/rooms/SendMessageComposer-test.js
+++ b/test/components/views/rooms/SendMessageComposer-test.js
@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import '../../../skinned-sdk'; // Must be first for skinning to work
 import Adapter from "enzyme-adapter-react-16";
 import { configure, mount } from "enzyme";
 import React from "react";
diff --git a/test/createRoom-test.js b/test/createRoom-test.js
index f7e8617c3f..ed8f9779f7 100644
--- a/test/createRoom-test.js
+++ b/test/createRoom-test.js
@@ -1,3 +1,4 @@
+import './skinned-sdk'; // Must be first for skinning to work
 import {_waitForMember, canEncryptToAllUsers} from '../src/createRoom';
 import {EventEmitter} from 'events';
 
diff --git a/test/editor/deserialize-test.js b/test/editor/deserialize-test.js
index 112ac7d02b..07b75aaae5 100644
--- a/test/editor/deserialize-test.js
+++ b/test/editor/deserialize-test.js
@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import '../skinned-sdk'; // Must be first for skinning to work
 import {parseEvent} from "../../src/editor/deserialize";
 import {createPartCreator} from "./mock";
 

From ac1ce24b74c631346a653a17e79ff20ddbc9e754 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 9 Mar 2021 20:52:30 -0700
Subject: [PATCH 237/420] Fix sent markers disappearing for edits/reactions

Fixes https://github.com/vector-im/element-web/issues/16651
---
 src/components/structures/MessagePanel.js | 24 +++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 9deda54bee..b0705b5878 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -534,10 +534,17 @@ export default class MessagePanel extends React.Component {
                     const nextEvent = i < this.props.events.length - 1
                         ? this.props.events[i + 1]
                         : null;
+
+                    // The next event with tile is used to to determine the 'last successful' flag
+                    // when rendering the tile. The shouldShowEvent function is pretty quick at what
+                    // it does, so this should have no significant cost even when a room is used for
+                    // not-chat purposes.
+                    const nextTile = this.props.events.slice(i + 1).find(e => this._shouldShowEvent(e));
+
                     // make sure we unpack the array returned by _getTilesForEvent,
                     // otherwise react will auto-generate keys and we will end up
                     // replacing all of the DOM elements every time we paginate.
-                    ret.push(...this._getTilesForEvent(prevEvent, mxEv, last, nextEvent));
+                    ret.push(...this._getTilesForEvent(prevEvent, mxEv, last, nextEvent, nextTile));
                     prevEvent = mxEv;
                 }
 
@@ -553,7 +560,7 @@ export default class MessagePanel extends React.Component {
         return ret;
     }
 
-    _getTilesForEvent(prevEvent, mxEv, last, nextEvent) {
+    _getTilesForEvent(prevEvent, mxEv, last, nextEvent, nextEventWithTile) {
         const TileErrorBoundary = sdk.getComponent('messages.TileErrorBoundary');
         const EventTile = sdk.getComponent('rooms.EventTile');
         const DateSeparator = sdk.getComponent('messages.DateSeparator');
@@ -598,12 +605,21 @@ export default class MessagePanel extends React.Component {
         let isLastSuccessful = false;
         const isSentState = s => !s || s === 'sent';
         const isSent = isSentState(mxEv.getAssociatedStatus());
-        if (!nextEvent && isSent) {
+        const hasNextEvent = nextEvent && this._shouldShowEvent(nextEvent);
+        if (!hasNextEvent && isSent) {
             isLastSuccessful = true;
-        } else if (nextEvent && isSent && !isSentState(nextEvent.getAssociatedStatus())) {
+        } else if (hasNextEvent && isSent && !isSentState(nextEvent.getAssociatedStatus())) {
             isLastSuccessful = true;
         }
 
+        // This is a bit nuanced, but if our next event is hidden but a future event is not
+        // hidden then we're not the last successful.
+        if (nextEventWithTile) { // avoid length limit by wrapping in an if
+            if (isSentState(nextEventWithTile.getAssociatedStatus()) && nextEventWithTile !== nextEvent) {
+                isLastSuccessful = false;
+            }
+        }
+
         // We only want to consider "last successful" if the event is sent by us, otherwise of course
         // it's successful: we received it.
         isLastSuccessful = isLastSuccessful && mxEv.getSender() === MatrixClientPeg.get().getUserId();

From f25db38b2b304b60c1c8b2c2d93eeaca9fb90742 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 9 Mar 2021 21:13:23 -0700
Subject: [PATCH 238/420] Add tooltips to sent/sending receipts

Fixes https://github.com/vector-im/element-web/issues/16649
---
 src/components/views/rooms/EventTile.js | 62 ++++++++++++++++++++++---
 src/i18n/strings/en_EN.json             |  3 ++
 2 files changed, 59 insertions(+), 6 deletions(-)

diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index a705e92d9c..ecc7eb7131 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -39,6 +39,7 @@ import {WidgetType} from "../../../widgets/WidgetType";
 import RoomAvatar from "../avatars/RoomAvatar";
 import {WIDGET_LAYOUT_EVENT_TYPE} from "../../../stores/widgets/WidgetLayoutStore";
 import {objectHasDiff} from "../../../utils/objects";
+import Tooltip from "../elements/Tooltip";
 
 const eventTileTypes = {
     'm.room.message': 'messages.MessageEvent',
@@ -567,11 +568,8 @@ export default class EventTile extends React.Component {
     };
 
     getReadAvatars() {
-        if (this._shouldShowSentReceipt) {
-            return <span className="mx_EventTile_readAvatars"><span className='mx_EventTile_receiptSent' /></span>;
-        }
-        if (this._shouldShowSendingReceipt) {
-            return <span className="mx_EventTile_readAvatars"><span className='mx_EventTile_receiptSending' /></span>;
+        if (this._shouldShowSentReceipt || this._shouldShowSendingReceipt) {
+            return <SentReceipt messageState={this.props.mxEvent.getAssociatedStatus()} />;
         }
 
         // return early if there are no read receipts
@@ -1180,7 +1178,6 @@ class E2ePadlock extends React.Component {
     render() {
         let tooltip = null;
         if (this.state.hover) {
-            const Tooltip = sdk.getComponent("elements.Tooltip");
             tooltip = <Tooltip className="mx_EventTile_e2eIcon_tooltip" label={this.props.title} dir="auto" />;
         }
 
@@ -1195,3 +1192,56 @@ class E2ePadlock extends React.Component {
         );
     }
 }
+
+interface ISentReceiptProps {
+    messageState: string; // TODO: Types for message sending state
+}
+
+interface ISentReceiptState {
+    hover: boolean;
+}
+
+class SentReceipt extends React.PureComponent<ISentReceiptProps, ISentReceiptState> {
+    constructor() {
+        super();
+
+        this.state = {
+            hover: false,
+        };
+    }
+
+    onHoverStart = () => {
+        this.setState({hover: true});
+    };
+
+    onHoverEnd = () => {
+        this.setState({hover: false});
+    };
+
+    render() {
+        const isSent = !this.props.messageState || this.props.messageState === 'sent';
+        const receiptClasses = classNames({
+            'mx_EventTile_receiptSent': isSent,
+            'mx_EventTile_receiptSending': !isSent,
+        });
+
+        let tooltip = null;
+        if (this.state.hover) {
+            let label = _t("Sending your message...");
+            if (this.props.messageState === 'encrypting') {
+                label = _t("Encrypting your message...");
+            } else if (isSent) {
+                label = _t("Your message was sent");
+            }
+            // The yOffset is somewhat arbitrary - it just brings the tooltip down to be more associated
+            // with the read receipt.
+            tooltip = <Tooltip className="mx_EventTile_readAvatars_receiptTooltip" label={label} yOffset={20} />;
+        }
+
+        return <span className="mx_EventTile_readAvatars">
+            <span className={receiptClasses} onMouseEnter={this.onHoverStart} onMouseLeave={this.onHoverEnd}>
+                {tooltip}
+            </span>
+        </span>;
+    }
+}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 833a8c7838..9ed75bde37 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1440,6 +1440,9 @@
     "Unencrypted": "Unencrypted",
     "Encrypted by a deleted session": "Encrypted by a deleted session",
     "The authenticity of this encrypted message can't be guaranteed on this device.": "The authenticity of this encrypted message can't be guaranteed on this device.",
+    "Sending your message...": "Sending your message...",
+    "Encrypting your message...": "Encrypting your message...",
+    "Your message was sent": "Your message was sent",
     "Please select the destination room for this message": "Please select the destination room for this message",
     "Scroll to most recent messages": "Scroll to most recent messages",
     "Close preview": "Close preview",

From 78568d6a015c764ae1a5eaed70b35b0ab14d40e8 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 10 Mar 2021 01:40:43 -0700
Subject: [PATCH 239/420] Document behaviour of showReadReceipts=false for sent
 receipts

---
 src/components/structures/MessagePanel.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 9deda54bee..353fd80528 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -498,6 +498,9 @@ export default class MessagePanel extends React.Component {
 
         let prevEvent = null; // the last event we showed
 
+        // Note: the EventTile might still render a "sent/sending receipt" independent of
+        // this information. When not providing read receipt information, the tile is likely
+        // to assume that sent receipts are to be shown more often.
         this._readReceiptsByEvent = {};
         if (this.props.showReadReceipts) {
             this._readReceiptsByEvent = this._getReadReceiptsByShownEvent();

From 0583ea6a253074f300f7e17c213762f974b8a47b Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Wed, 10 Mar 2021 12:11:48 +0000
Subject: [PATCH 240/420] Ignore to-device decryption in the room list store

This avoids meaningless warnings about "unknown" rooms.
---
 src/stores/room-list/RoomListStore.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/stores/room-list/RoomListStore.ts b/src/stores/room-list/RoomListStore.ts
index 5775e685fd..3f415f946d 100644
--- a/src/stores/room-list/RoomListStore.ts
+++ b/src/stores/room-list/RoomListStore.ts
@@ -302,6 +302,9 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
         } else if (payload.action === 'MatrixActions.Event.decrypted') {
             const eventPayload = (<any>payload); // TODO: Type out the dispatcher types
             const roomId = eventPayload.event.getRoomId();
+            if (!roomId) {
+                return;
+            }
             const room = this.matrixClient.getRoom(roomId);
             if (!room) {
                 console.warn(`Event ${eventPayload.event.getId()} was decrypted in an unknown room ${roomId}`);

From 32f737e1ba6e442974067c058dd192785e526d00 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Wed, 10 Mar 2021 13:45:37 +0000
Subject: [PATCH 241/420] Tweak sent marker code style

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

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index b0705b5878..f8bf554cb3 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -614,10 +614,12 @@ export default class MessagePanel extends React.Component {
 
         // This is a bit nuanced, but if our next event is hidden but a future event is not
         // hidden then we're not the last successful.
-        if (nextEventWithTile) { // avoid length limit by wrapping in an if
-            if (isSentState(nextEventWithTile.getAssociatedStatus()) && nextEventWithTile !== nextEvent) {
-                isLastSuccessful = false;
-            }
+        if (
+            nextEventWithTile &&
+            nextEventWithTile !== nextEvent &&
+            isSentState(nextEventWithTile.getAssociatedStatus())
+        ) {
+            isLastSuccessful = false;
         }
 
         // We only want to consider "last successful" if the event is sent by us, otherwise of course

From fc180cd6d4efc02c2193efbbc23c628fdf3e1d05 Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Mon, 8 Mar 2021 23:12:51 +0000
Subject: [PATCH 242/420] Translated using Weblate (German)

Currently translated at 99.6% (2769 of 2780 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-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 7304d35fcd..f0f371ebe5 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -3076,5 +3076,6 @@
     "Settable at global": "Global festlegbar",
     "Setting definition:": "Definition der Einstellung:",
     "Value in this room": "Wert in diesem Raum",
-    "Settings Explorer": "Einstellungs-Explorer"
+    "Settings Explorer": "Einstellungs-Explorer",
+    "Values at explicit levels": "Werte für explizite Levels"
 }

From 73327c9bc68b166e6af1973c786aa067524f2421 Mon Sep 17 00:00:00 2001
From: libexus <Asterixeins324@gmail.com>
Date: Mon, 8 Mar 2021 23:12:26 +0000
Subject: [PATCH 243/420] Translated using Weblate (German)

Currently translated at 99.6% (2769 of 2780 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
---
 src/i18n/strings/de_DE.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index f0f371ebe5..65e08ae4c3 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -3073,9 +3073,10 @@
     "Show chat effects (animations when receiving e.g. confetti)": "Animierte Chateffekte zeigen, wenn z.B. Konfetti-Emojis erhalten werden",
     "Save setting values": "Einstellungswerte speichern",
     "Caution:": "Vorsicht:",
-    "Settable at global": "Global festlegbar",
+    "Settable at global": "Global einstellbar",
     "Setting definition:": "Definition der Einstellung:",
     "Value in this room": "Wert in diesem Raum",
     "Settings Explorer": "Einstellungs-Explorer",
-    "Values at explicit levels": "Werte für explizite Levels"
+    "Values at explicit levels": "Werte für explizite Levels",
+    "Settable at room": "Für den Raum einstellbar"
 }

From 2125438aac407222b88d4578bf2ce187c6301999 Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Wed, 10 Mar 2021 09:27:48 +0000
Subject: [PATCH 244/420] Translated using Weblate (Esperanto)

Currently translated at 99.1% (2755 of 2780 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/eo/
---
 src/i18n/strings/eo.json | 41 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 40 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 3f99a68187..390fb74099 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -3006,5 +3006,44 @@
     "Your homeserver was unreachable and was not able to log you in. Please try again. If this continues, please contact your homeserver administrator.": "Via hejmservilo estis neatingebla kaj ne povis vin salutigi. Bonvolu reprovi. Se tio daŭros, bonvolu kontakti la administranton de via hejmservilo.",
     "Try again": "Reprovu",
     "We asked the browser to remember which homeserver you use to let you sign in, but unfortunately your browser has forgotten it. Go to the sign in page and try again.": "Ni petis la foliumilon memori, kiun hejmservilon vi uzas por saluti, sed domaĝe, via foliumilo forgesis. Iru al la saluta paĝo kaj reprovu.",
-    "We couldn't log you in": "Ni ne povis salutigi vin"
+    "We couldn't log you in": "Ni ne povis salutigi vin",
+    "%(creator)s created this DM.": "%(creator)s kreis ĉi tiun rektan ĉambron.",
+    "Invalid URL": "Nevalida URL",
+    "Unable to validate homeserver": "Ne povas validigi hejmservilon",
+    "Just a heads up, if you don't add an email and forget your password, you could <b>permanently lose access to your account</b>.": "Averte, se vi ne aldonos retpoŝtadreson kaj poste forgesos vian pasvorton, vi eble <b>por ĉiam perdos aliron al via konto</b>.",
+    "Continuing without email": "Daŭrigante sen retpoŝtadreso",
+    "We recommend you change your password and Security Key in Settings immediately": "Ni rekomendas, ke vi tuj ŝanĝu viajn pasvorton kaj Sekurecan ŝlosilon per la Agordoj",
+    "Transfer": "Transigi",
+    "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.": "Invitu iun per ĝia nomo, retpoŝtadreso, uzantonomo (ekz. <userId/>), aŭ <a>konigu ĉi tiun ĉambron</a>.",
+    "Start a conversation with someone using their name, email address or username (like <userId/>).": "Komencu interparolon kun iu per ĝia nomo, retpoŝtadreso, aŭ uzantonomo (ekz. <userId/>).",
+    "Failed to transfer call": "Malsukcesis transigi vokon",
+    "A call can only be transferred to a single user.": "Voko povas transiĝi nur al unu uzanto.",
+    "Learn more in our <privacyPolicyLink />, <termsOfServiceLink /> and <cookiePolicyLink />.": "Eksciu plion per niaj <privacyPolicyLink />, <termsOfServiceLink /> kaj <cookiePolicyLink />.",
+    "Failed to connect to your homeserver. Please close this dialog and try again.": "Malsukcesis konektiĝi al via hejmservilo. Bonvolu fermi ĉi tiun interagujon kaj reprovi.",
+    "Edit Values": "Redakti valorojn",
+    "Value in this room:": "Valoro en ĉi tiu ĉambro:",
+    "Value:": "Valoro:",
+    "Settable at room": "Agordebla ĉambre",
+    "Settable at global": "Agordebla ĉiee",
+    "Level": "Nivelo",
+    "Setting definition:": "Difino de agordo:",
+    "This UI does NOT check the types of the values. Use at your own risk.": "Ĉi tiu fasado ne kontrolas la tipojn de valoroj. Uzu je via risko.",
+    "Caution:": "Atentu:",
+    "Setting:": "Agordo:",
+    "Value in this room": "Valoro en ĉi tiu ĉambro",
+    "Value": "Valoro",
+    "Setting ID": "Identigilo de agordo",
+    "Failed to save settings": "Malsukcesis konservi agordojn",
+    "Settings Explorer": "Esplorilo de agordoj",
+    "Set my room layout for everyone": "Agordi al ĉiuj mian aranĝon de ĉambro",
+    "Open dial pad": "Malfermi ciferplaton",
+    "Back up your encryption keys with your account data in case you lose access to your sessions. Your keys will be secured with a unique Security Key.": "Savkopiu viajn čifrajn šlosilojn kune kun la datumoj de via konto, okaze ke vi perdos aliron al viaj salutaĵoj. Viaj ŝlosiloj sekuriĝos per unika Sekureca ŝlosilo.",
+    "Dial pad": "Ciferplato",
+    "Show chat effects (animations when receiving e.g. confetti)": "Montri grafikaĵojn en babilujo (ekz. movbildojn, ricevante konfetojn)",
+    "Use Ctrl + Enter to send a message": "Sendu mesaĝon per stirklavo (Ctrl) + eniga klavo",
+    "Use Command + Enter to send a message": "Sendu mesaĝon per komanda klavo + eniga klavo",
+    "Use Ctrl + F to search": "Serĉu per stirklavo (Ctrl) + F",
+    "Use Command + F to search": "Serĉu per komanda klavo + F",
+    "%(senderDisplayName)s changed the server ACLs for this room.": "%(senderDisplayName)s ŝanĝis la servilblokajn listojn por ĉi tiu ĉambro.",
+    "%(senderDisplayName)s set the server ACLs for this room.": "%(senderDisplayName)s agordis la servilblokajn listojn por ĉi tiu ĉambro."
 }

From 7c497cc96e2e6d566008e15e44ccc50d5319b210 Mon Sep 17 00:00:00 2001
From: jelv <post@jelv.nl>
Date: Wed, 10 Mar 2021 15:13:56 +0000
Subject: [PATCH 245/420] Translated using Weblate (Dutch)

Currently translated at 100.0% (2780 of 2780 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
---
 src/i18n/strings/nl.json | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index db3255c051..18c7c3b0bf 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -145,7 +145,7 @@
     "Displays action": "Toont actie",
     "Emoji": "Emoji",
     "%(senderName)s ended the call.": "%(senderName)s heeft opgehangen.",
-    "Enter passphrase": "Voer wachtwoord in",
+    "Enter passphrase": "Wachtwoord invoeren",
     "Error decrypting attachment": "Fout bij het ontsleutelen van de bijlage",
     "Error: Problem communicating with the given homeserver.": "Fout: probleem bij communicatie met de gegeven thuisserver.",
     "Existing Call": "Bestaande oproep",
@@ -335,11 +335,11 @@
     "Passphrases must match": "Wachtwoorden moeten overeenkomen",
     "Passphrase must not be empty": "Wachtwoord mag niet leeg zijn",
     "Export room keys": "Gesprekssleutels wegschrijven",
-    "Confirm passphrase": "Bevestig wachtwoord",
+    "Confirm passphrase": "Wachtwoord bevestigen",
     "Import room keys": "Gesprekssleutels inlezen",
     "File to import": "In te lezen bestand",
     "This process allows you to export the keys for messages you have received in encrypted rooms to a local file. You will then be able to import the file into another Matrix client in the future, so that client will also be able to decrypt these messages.": "Hiermee kunt u de sleutels van uw ontvangen berichten in versleutelde gesprekken naar een lokaal bestand wegschrijven. Als u dat bestand dan in een andere Matrix-cliënt inleest kan die ook die berichten ontcijferen.",
-    "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a passphrase below, which will be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "Wie het weggeschreven bestand kan lezen, kan daarmee ook alle versleutelde berichten die u kunt zien ontcijferen - ga er dus zorgvuldig mee om! Daartoe kunt u hieronder een wachtwoord invoeren, dat dan gebruikt zal worden om het bestand te versleutelen. Het is dan enkel mogelijk de gegevens in te lezen met hetzelfde wachtwoord.",
+    "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.": "Het opgeslagen bestand geeft toegang tot het lezen en schrijven van uw versleutelde berichten - ga er dus zorgvuldig mee om! Bescherm uzelf door hieronder een wachtwoord in te voeren, dat dan gebruikt zal worden om het bestand te versleutelen. Het is dan alleen mogelijk de gegevens te lezen met hetzelfde wachtwoord.",
     "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "Hiermee kunt u vanuit een andere Matrix-cliënt weggeschreven versleutelingssleutels inlezen, zodat u alle berichten die de andere cliënt kon ontcijferen ook hier kunt lezen.",
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Het weggeschreven bestand is beveiligd met een wachtwoord. Voer dat wachtwoord hier in om het bestand te ontsleutelen.",
     "You must join the room to see its files": "Slechts na toetreding tot het gesprek zult u de bestanden kunnen zien",
@@ -792,7 +792,7 @@
     "Enable widget screenshots on supported widgets": "Widget-schermafbeeldingen inschakelen op ondersteunde widgets",
     "Muted Users": "Gedempte gebruikers",
     "Popout widget": "Widget in nieuw venster openen",
-    "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Kan de gebeurtenis waarop gereageerd was niet laden. Wellicht bestaat die niet, of heeft u geen toestemming die te bekijken.",
+    "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Kan de gebeurtenis waarop gereageerd was niet laden. Wellicht bestaat die niet, of u heeft geen toestemming die te bekijken.",
     "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. <b>This action is irreversible.</b>": "Dit zal uw account voorgoed onbruikbaar maken. U zult niet meer kunnen inloggen, en niemand anders zal zich met dezelfde gebruikers-ID kunnen registreren. Hierdoor zal uw account alle gesprekken waaraan u deelneemt verlaten, en worden de accountgegevens verwijderd van de identiteitsserver. <b>Deze stap is onomkeerbaar.</b>",
     "Deactivating your account <b>does not by default cause us to forget messages you have sent.</b> If you would like us to forget your messages, please tick the box below.": "Het sluiten van uw account <b>maakt op zich niet dat wij de door u verstuurde berichten vergeten.</b> Als u wilt dat wij uw berichten vergeten, vink dan het vakje hieronder aan.",
     "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "De zichtbaarheid van berichten in Matrix is zoals bij e-mails. Het vergeten van uw berichten betekent dat berichten die u heeft verstuurd niet meer gedeeld worden met nieuwe of ongeregistreerde gebruikers, maar geregistreerde gebruikers die al toegang hebben tot deze berichten zullen alsnog toegang hebben tot hun eigen kopie ervan.",
@@ -1641,7 +1641,7 @@
     "Your user agent": "Jouw gebruikersagent",
     "If you cancel now, you won't complete verifying the other user.": "Als u nu annuleert zult u de andere gebruiker niet verifiëren.",
     "If you cancel now, you won't complete verifying your other session.": "Als u nu annuleert zult u uw andere sessie niet verifiëren.",
-    "Cancel entering passphrase?": "Wachtwoordinvoer annuleren?",
+    "Cancel entering passphrase?": "Wachtwoord annuleren?",
     "Show typing notifications": "Typmeldingen weergeven",
     "Verify this session by completing one of the following:": "Verifieer deze sessie door een van het volgende te doen:",
     "Scan this unique code": "Scan deze unieke code",
@@ -1981,8 +1981,8 @@
     "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.",
     "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 ingelogd bent",
-    "New login. Was this you?": "Nieuwe login - was u dat?",
+    "Review where you’re logged in": "Controleer waar u ingelogd bent",
+    "New login. Was this you?": "Nieuwe login gevonden. 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",
@@ -2330,8 +2330,8 @@
     "Start a conversation with someone using their name, email address or username (like <userId/>).": "Start een gesprek met iemand door hun naam, emailadres of gebruikersnaam (zoals <userId/>) te typen.",
     "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.": "Berichten hier zijn eind-tot-eind versleuteld. Verifieer %(displayName)s op hun profiel - klik op hun avatar.",
     "%(creator)s created this DM.": "%(creator)s maakte deze DM.",
-    "Switch to dark mode": "Wissel naar donkere modus",
-    "Switch to light mode": "Wissel naar lichte modus",
+    "Switch to dark mode": "Naar donkere modus wisselen",
+    "Switch to light mode": "Naar lichte modus wisselen",
     "Appearance": "Weergave",
     "All settings": "Alle instellingen",
     "Error removing address": "Fout bij verwijderen van adres",
@@ -2696,7 +2696,7 @@
     "Calls": "Oproepen",
     "Navigation": "Navigatie",
     "Currently indexing: %(currentRoom)s": "Momenteel indexeren: %(currentRoom)s",
-    "Enter your recovery passphrase a second time to confirm it.": "Voer uw herstel wachtwoord een tweede keer in om te bevestigen.",
+    "Enter your recovery passphrase a second time to confirm it.": "Voer uw Herstelwachtwoord een tweede keer in om te bevestigen.",
     "This session has detected that your Security Phrase and key for Secure Messages have been removed.": "Deze sessie heeft ontdekt dat uw veiligheidszin en sleutel voor versleutelde berichten zijn verwijderd.",
     "A new Security Phrase and key for Secure Messages have been detected.": "Er is een nieuwe veiligheidszin en sleutel voor versleutelde berichten gedetecteerd.",
     "Save your Security Key": "Uw veiligheidssleutel opslaan",
@@ -2708,7 +2708,7 @@
     "Secret storage:": "Sleutelopslag:",
     "Unable to query secret storage status": "Kan status sleutelopslag niet opvragen",
     "Store your Security Key somewhere safe, like a password manager or a safe, as it’s used to safeguard your encrypted data.": "Bewaar uw veiligheidssleutel op een veilige plaats, zoals in een wachtwoordmanager of een kluis, aangezien deze wordt gebruikt om uw versleutelde gegevens te beveiligen.",
-    "Confirm your recovery passphrase": "Bevestig uw herstel wachtwoord",
+    "Confirm your recovery passphrase": "Bevestig uw Herstelwachtwoord",
     "Use a different passphrase?": "Gebruik een ander wachtwoord?",
     "Enter a security phrase only you know, as it’s used to safeguard your data. To be secure, you shouldn’t re-use your account password.": "Voer een veiligheidszin in die alleen u kent, aangezien deze wordt gebruikt om uw gegevens te versleutelen. Om veilig te zijn, moet u het wachtwoord van uw account niet opnieuw gebruiken.",
     "Safeguard against losing access to encrypted messages & data by backing up encryption keys on your server.": "Bescherm uw server tegen toegangsverlies tot versleutelde berichten en gegevens door een back-up te maken van de versleutelingssleutels.",
@@ -2797,7 +2797,7 @@
     "Not a valid Security Key": "Geen geldige veiligheidssleutel",
     "This looks like a valid Security Key!": "Dit lijkt op een geldige veiligheidssleutel!",
     "Enter Security Key": "Veiligheidssleutel invoeren",
-    "If you've forgotten your Security Phrase you can <button1>use your Security Key</button1> or <button2>set up new recovery options</button2>": "Als u uw veiligheidszin bent vergeten, kunt u <button1>uw veiligheidssleutel gebruiken</button1> of <button2>nieuwe herstelopties instellen</button2>",
+    "If you've forgotten your Security Phrase you can <button1>use your Security Key</button1> or <button2>set up new recovery options</button2>": "Als u uw Herstelwachtwoord bent vergeten, kunt u <button1>uw Herstelsleutel gebruiken</button1> of <button2>nieuwe herstelopties instellen</button2>",
     "Access your secure message history and set up secure messaging by entering your Security Phrase.": "Ga naar uw veilige berichtengeschiedenis en stel veilige berichten in door uw veiligheidszin in te voeren.",
     "Enter Security Phrase": "Voer veiligheidszin in",
     "Successfully restored %(sessionCount)s keys": "Succesvol %(sessionCount)s sleutels hersteld",

From e2cdc93be4a200f7d8c7bf759ad4f8413870d814 Mon Sep 17 00:00:00 2001
From: MamasLT <admin@eastwesthost.com>
Date: Tue, 9 Mar 2021 13:39:41 +0000
Subject: [PATCH 246/420] Translated using Weblate (Lithuanian)

Currently translated at 68.5% (1907 of 2780 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/lt/
---
 src/i18n/strings/lt.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/lt.json b/src/i18n/strings/lt.json
index 80b70e67e4..1973247e66 100644
--- a/src/i18n/strings/lt.json
+++ b/src/i18n/strings/lt.json
@@ -2089,5 +2089,7 @@
     "If your other sessions do not have the key for this message you will not be able to decrypt them.": "Jei jūsų kiti seansai neturi šios žinutės rakto, jūs negalėsite jos iššifruoti.",
     "Missing session data": "Trūksta seanso duomenų",
     "Successfully restored %(sessionCount)s keys": "Sėkmingai atkurti %(sessionCount)s raktai",
-    "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.": "Įspėjimas: Jūsų asmeniniai duomenys (įskaitant šifravimo raktus) vis dar yra saugomi šiame seanse. Išvalykite juos, jei baigėte naudoti šį seansą, arba norite prisijungti prie kitos paskyros."
+    "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.": "Įspėjimas: Jūsų asmeniniai duomenys (įskaitant šifravimo raktus) vis dar yra saugomi šiame seanse. Išvalykite juos, jei baigėte naudoti šį seansą, arba norite prisijungti prie kitos paskyros.",
+    "Reason (optional)": "Priežastis (nebūtina)",
+    "Reason: %(reason)s": "Priežastis: %(reason)s"
 }

From 0fe1e2dc182eb833a832fd242cd28b235bcb7072 Mon Sep 17 00:00:00 2001
From: tateisu <tateisu@gmail.com>
Date: Wed, 10 Mar 2021 13:37:09 +0000
Subject: [PATCH 247/420] Translated using Weblate (Japanese)

Currently translated at 79.1% (2199 of 2780 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ja/
---
 src/i18n/strings/ja.json | 839 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 820 insertions(+), 19 deletions(-)

diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index ea7d51ae05..0035bdd5df 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -341,7 +341,7 @@
     "Unable to connect to Homeserver. Retrying...": "ホームサーバーに接続できません。 再試行中...",
     "Your browser does not support the required cryptography extensions": "お使いのブラウザは、必要な暗号化拡張機能をサポートしていません",
     "Not a valid %(brand)s keyfile": "有効な%(brand)sキーファイルではありません",
-    "Authentication check failed: incorrect password?": "認証に失敗しました: パスワードの間違っている可能性があります。",
+    "Authentication check failed: incorrect password?": "認証に失敗しました: 間違ったパスワード?",
     "Sorry, your homeserver is too old to participate in this room.": "申し訳ありませんが、あなたのホームサーバーはこの部屋に参加するには古すぎます。",
     "Please contact your homeserver administrator.": "ホームサーバー管理者に連絡してください。",
     "Failed to join room": "部屋に参加できませんでした",
@@ -554,7 +554,7 @@
     "Only visible to community members": "コミュニティメンバーにのみ表示されます",
     "Filter community rooms": "コミュニティルームを絞り込む",
     "Something went wrong when trying to get your communities.": "コミュニティに参加しようとすると何かがうまくいかなかった。",
-    "Display your community flair in rooms configured to show it.": "表示するよう設定した部屋であなたのコミュニティ バッジを表示",
+    "Display your community flair in rooms configured to show it.": "表示するよう設定した部屋であなたのコミュニティ バッジを表示します。",
     "Show developer tools": "開発者ツールを表示",
     "You're not currently a member of any communities.": "あなたは現在、どのコミュニティのメンバーでもありません。",
     "Unknown Address": "不明な住所",
@@ -875,7 +875,7 @@
     "Open Devtools": "開発ツールを開く",
     "Flair": "バッジ",
     "Fill screen": "フィルスクリーン",
-    "Unignore": "無視しない",
+    "Unignore": "無視をやめる",
     "Unable to load! Check your network connectivity and try again.": "ロードできません！ ネットワーク通信を確認の上もう一度お試しください。",
     "Failed to invite users to the room:": "部屋にユーザーを招待できませんでした:",
     "You do not have permission to invite people to this room.": "この部屋にユーザーを招待する権限がありません。",
@@ -1064,7 +1064,7 @@
     "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s がこの部屋に %(groups)s のバッジを追加しました。",
     "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s がこの部屋から %(groups)s のバッジを削除しました。",
     "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s が %(newGroups)s のバッジを追加し、 %(oldGroups)s のバッジを削除しました。",
-    "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "キーが正常にバックアップされていない場合、暗号化されたメッセージにアクセスできなくなります。本当によろしいですか？",
+    "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "本当によろしいですか？ もしキーが正常にバックアップされていない場合、暗号化されたメッセージにアクセスできなくなります。",
     "not stored": "保存されていません",
     "All keys backed up": "すべてのキーがバックアップされました",
     "Backup version: ": "バックアップのバージョン: ",
@@ -1072,7 +1072,7 @@
     "Backup key stored: ": "バックアップキーの保存: ",
     "Back up your keys before signing out to avoid losing them.": "暗号化キーを失くさないために、サインアウトする前にキーをバックアップしてください。",
     "Start using Key Backup": "キーのバックアップをはじめる",
-    "Error updating flair": "バッジの更新でエラーが発生しました。",
+    "Error updating flair": "バッジの更新でエラーが発生しました",
     "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "この部屋のバッジの更新でエラーが発生しました。サーバーが許可していないか、一時的なエラーが発生しました。",
     "Edited at %(date)s. Click to view edits.": "%(date)sに編集。クリックして編集を表示。",
     "edited": "編集済み",
@@ -1103,7 +1103,7 @@
     "Session ID:": "セッション ID:",
     "Session key:": "セッション鍵:",
     "Cross-signing": "クロス署名",
-    "A session's public name is visible to people you communicate with": "各セッションの公開名は、あなたの連絡先のユーザーが閲覧できます。",
+    "A session's public name is visible to people you communicate with": "各セッションの公開名は、あなたの連絡先のユーザーが閲覧できます",
     "Session name": "セッション名",
     "Session key": "セッション鍵",
     "Never send encrypted messages to unverified sessions from this session": "このセッションでは、未検証のセッションに対して暗号化されたメッセージを送信しない",
@@ -1161,7 +1161,7 @@
     "Confirm": "確認",
     "Enable audible notifications for this session": "このセッションでは音声通知を有効にする",
     "Enable encryption?": "暗号化を有効にしますか？",
-    "Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only by the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly. <a>Learn more about encryption.</a>": "一度有効にした部屋の暗号化は無効にすることはできません。暗号化された部屋で送信されたメッセージは、サーバーからは見ることができず、その部屋の参加者だけが見ることができます。暗号化を有効にすると、多くのボットやブリッジが正常に動作しなくなる場合があります。<a>暗号化についての詳細はこちらをご覧ください</a>。",
+    "Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only by the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly. <a>Learn more about encryption.</a>": "一度有効にした部屋の暗号化は無効にすることはできません。暗号化された部屋で送信されたメッセージは、サーバーからは見ることができず、その部屋の参加者だけが見ることができます。暗号化を有効にすると、多くのボットやブリッジが正常に動作しなくなる場合があります。<a>暗号化についての詳細はこちらをご覧ください。</a>",
     "Enter username": "ユーザー名を入力",
     "Email (optional)": "メールアドレス (任意)",
     "Phone (optional)": "電話番号 (任意)",
@@ -1208,7 +1208,7 @@
     "Suggestions": "提案",
     "Start a conversation with someone using their name, username (like <userId/>) or email address.": "相手の名前、( <userId/> のような)ユーザー名、メールアドレスを使って会話を開始できます。",
     "Go": "続行",
-    "Session already verified!": "このセッションは検証済みです。",
+    "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": "入力中通知を表示する",
@@ -1234,11 +1234,11 @@
     " to store messages from ": " を使用中であり ",
     "rooms.": "件の部屋のメッセージが含まれています。",
     "Manage": "管理",
-    "Add an email address to configure email notifications": "メールアドレスを追加すると電子メール通知の設定も行えます。",
+    "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!": "アカウントの無効化は取り消せません。ご注意ください。",
+    "Deactivating your account is a permanent action - be careful!": "アカウントの無効化は取り消せません。注意してください!",
     "Deactivate account": "アカウントの無効化",
     "Room list": "部屋一覧",
     "Timeline": "タイムライン",
@@ -1283,7 +1283,7 @@
     "Backup has a signature from <verify>unknown</verify> session with ID %(deviceId)s": "バックアップには、ID %(deviceId)s の<verify>未知のセッション</verify>による署名があります",
     "Backup has a <validity>valid</validity> signature from this session": "バックアップには、このセッションによる<validity>有効</validity>な署名があります",
     "Backup has an <validity>invalid</validity> signature from this session": "バックアップには、このセッションによる<validity>無効</validity>な署名があります",
-    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> session <device></device>": "バックアップには、<verify>検証済み</verify>のセッション <device></device> による<validity>有効</validity>な署名があります",
+    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> session <device></device>": "バックアップには<verify>検証された</verify>セッションの<device></device> による<validity>有効な</validity>署名があります",
     "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> session <device></device>": "バックアップには、<verify>未検証</verify>のセッション <device></device> による<validity>有効</validity>な署名があります",
     "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> session <device></device>": "バックアップには、<verify>検証済み</verify>のセッション <device></device> による<validity>無効</validity>な署名があります",
     "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "バックアップには、<verify>未検証</verify>のセッション <device></device> による<validity>無効</validity>な署名があります",
@@ -1313,7 +1313,7 @@
     "Autocomplete delay (ms)": "自動補完の遅延 (ms)",
     "Missing media permissions, click the button below to request.": "メディア権限が不足しています、リクエストするには下のボタンを押してください。",
     "Request media permissions": "メディア権限をリクエスト",
-    "Joining room …": "部屋に参加中...",
+    "Joining room …": "部屋に参加中…",
     "Join the discussion": "話し合いに参加",
     "%(roomName)s can't be previewed. Do you want to join it?": "%(roomName)s はプレビューできません。部屋に参加しますか？",
     "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "他のユーザーがあなたのホームサーバー (%(localDomain)s) を通じてこの部屋を見つけられるよう、アドレスを設定しましょう",
@@ -1436,9 +1436,9 @@
     "Report bugs & give feedback": "バグ報告とフィードバック",
     "Everyone in this room is verified": "この部屋内の全員を検証済み",
     "Verify all users in a room to ensure it's secure.": "この部屋内のすべてのユーザーが安全であることを確認しました。",
-    "You've successfully verified %(displayName)s!": "%(displayName)s は正常に検証されました。",
-    "You've successfully verified %(deviceName)s (%(deviceId)s)!": "%(deviceName)s (%(deviceId)s) は正常に検証されました。",
-    "You've successfully verified your device!": "このデバイスは正常に検証されました。",
+    "You've successfully verified %(displayName)s!": "%(displayName)s は正常に検証されました!",
+    "You've successfully verified %(deviceName)s (%(deviceId)s)!": "%(deviceName)s (%(deviceId)s) は正常に検証されました!",
+    "You've successfully verified your device!": "このデバイスは正常に検証されました!",
     "You've successfully verified this user.": "このユーザーは正常に検証されました。",
     "Reject & Ignore user": "拒否した上でこのユーザーを無視する",
     "<userName/> invited you": "<userName/> があなたを招待しています",
@@ -1452,7 +1452,7 @@
     "Got it": "了解",
     "Got It": "了解",
     "Accepting…": "了承中…",
-    "Waiting for %(displayName)s to verify…": "%(displayName)s が検証するのを待っています…",
+    "Waiting for %(displayName)s to verify…": "%(displayName)s による検証を待っています…",
     "Waiting for %(displayName)s to accept…": "%(displayName)s が了承するのを待っています…",
     "Room avatar": "部屋のアバター",
     "Start Verification": "検証を開始",
@@ -1484,7 +1484,7 @@
     "e.g. my-room": "例: my-room",
     "Room address": "ルームアドレス",
     "New published address (e.g. #alias:server)": "新しい公開アドレス (例: #alias:server)",
-    "No other published addresses yet, add one below": "現在、公開アドレスがありません。以下から追加可能です。",
+    "No other published addresses yet, add one below": "現在、公開アドレスがありません。以下から追加可能です",
     "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "検索結果を表示させるために、暗号化されたメッセージをローカルに安全にキャッシュしています。現在、%(rooms)s 件の部屋のメッセージの保存に %(size)s を使用中です。",
     "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "検索結果を表示させるために、暗号化されたメッセージをローカルに安全にキャッシュしています。現在、%(rooms)s 件の部屋のメッセージの保存に %(size)s を使用中です。",
     "Mentions & Keywords": "メンションとキーワード",
@@ -1531,9 +1531,810 @@
     "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.": "鍵共有リクエストは自動的にあなたの他のセッションに送信されます。他のセッションで鍵共有リクエストを拒否または却下した場合は、ここをクリックしてこのセッションの鍵を再度リクエストしてください。",
     "Your key share request has been sent - please check your other sessions for key share requests.": "鍵共有リクエストが送信されました。あなたの他のセッションで鍵共有リクエストをご確認ください。",
     "<requestLink>Re-request encryption keys</requestLink> from your other sessions.": "あなたの他のセッションに<requestLink>暗号鍵を再リクエストする</requestLink>。",
-    "Block anyone not part of %(serverName)s from ever joining this room.": "%(serverName)s 以外からの参加をブロック",
+    "Block anyone not part of %(serverName)s from ever joining this room.": "%(serverName)s 以外からの参加をブロックします。",
     "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone.": "プライベートな部屋は招待者のみが参加できます。公開された部屋は誰でも検索・参加できます。",
     "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Matrix 関連のセキュリティ問題を報告するには、Matrix.org の <a>Security Disclosure Policy</a> をご覧ください。",
     "Confirm adding email": "メールアドレスの追加を確認する",
-    "Confirm adding this email address by using Single Sign On to prove your identity.": "シングルサインオンを使用して本人確認を行い、メールアドレスの追加を承認してください。"
+    "Confirm adding this email address by using Single Sign On to prove your identity.": "シングルサインオンを使用して本人確認を行い、メールアドレスの追加を承認してください。",
+    "There was an error creating that address. It may not be allowed by the server or a temporary failure occurred.": "そのアドレスの作成中にエラーが発生しました。 サーバーで許可されていないか、一時的な障害が発生した可能性があります。",
+    "Error creating address": "アドレスの作成中にエラーが発生しました",
+    "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "部屋の代替アドレスの更新中にエラーが発生しました。 サーバーで許可されていないか、一時的な障害が発生した可能性があります。",
+    "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "部屋のメインアドレスの更新中にエラーが発生しました。 サーバーで許可されていないか、一時的な障害が発生した可能性があります。",
+    "Error updating main address": "メインアドレスの更新中にエラーが発生しました",
+    "Mark all as read": "すべて既読としてマーク",
+    "Invited by %(sender)s": "%(sender)s からの招待",
+    "Revoke invite": "招待を取り消す",
+    "Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.": "招待を取り消すことができませんでした。 サーバーで一時的な問題が発生しているか、招待を取り消すための十分な権限がない可能性があります。",
+    "Failed to revoke invite": "招待を取り消せませんでした",
+    "Hint: Begin your message with <code>//</code> to start it with a slash.": "ヒント: 通常メッセージをスラッシュで開始したい場合は <code>//</code> から始めます。",
+    "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "<code>/help</code>を使って利用可能なコマンドを一覧できます。メッセージとして送るつもりでしたか?",
+    "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "この部屋はホームサーバが<i>不安定</i>と判断した部屋バージョン<roomVersion />で動作しています。",
+    "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "この部屋をアップグレードすると、部屋の現在のインスタンスがシャットダウンされて、同じ名前でアップグレードされた部屋が作成されます。",
+    "This room has already been upgraded.": "この部屋はすでにアップグレードされています。",
+    "Unread messages.": "未読メッセージ。",
+    "%(count)s unread messages.|one": "未読メッセージ1件。",
+    "%(count)s unread messages.|other": "未読メッセージ%(count)s件。",
+    "%(count)s unread messages including mentions.|one": "未読のメンション1件。",
+    "%(count)s unread messages including mentions.|other": "メンションを含む未読メッセージ%(count)s件。",
+    "Jump to first invite.": "最初の招待にジャンプします。",
+    "Jump to first unread room.": "未読のある最初の部屋にジャンプします。",
+    "A-Z": "A-Z",
+    "Activity": "活発さ",
+    "Show previews of messages": "メッセージのプレビューを表示する",
+    "Show rooms with unread messages first": "未読メッセージのある部屋を最初に表示する",
+    "%(errcode)s was returned while trying to access the room. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "部屋にアクセスしようとした際に エラー(%(errcode)s)が発生しました。このメッセージが誤って表示されていると思われる場合は<issueLink>バグレポートを送信してください</issueLink>。",
+    "Try again later, or ask a room admin to check if you have access.": "後でもう一度試すか、あなたがアクセスできるかどうか部屋の管理者に問い合わせてください。",
+    "This room doesn't exist. Are you sure you're at the right place?": "この部屋は存在しません。表示内容が正しくない可能性があります?",
+    "You're previewing %(roomName)s. Want to join it?": "部屋 %(roomName)s のプレビューです。参加したいですか?",
+    "Share this email in Settings to receive invites directly in %(brand)s.": "このメールアドレスを設定から共有すると、%(brand)s から招待を受け取れます。",
+    "Use an identity server in Settings to receive invites directly in %(brand)s.": "設定から identity サーバーを使うと、%(brand)s から直接招待を受け取れます。",
+    "This invite to %(roomName)s was sent to %(email)s": "部屋 %(roomName)s への正体はメールアドレス %(email)s へ送られました",
+    "Link this email with your account in Settings to receive invites directly in %(brand)s.": "このメールアドレスを設定からあなたのアカウントにリンクすると %(brand)s から直接招待を受け取ることができます。",
+    "This invite to %(roomName)s was sent to %(email)s which is not associated with your account": "部屋 %(roomName)s への招待はアカウントに関連付けられていないメールアドレス %(email)s に送られました",
+    "You can still join it because this is a public room.": "公開された部屋なので参加が可能です。",
+    "Try to join anyway": "とにかく参加してみる",
+    "You can only join it with a working invite.": "有効な招待がある場合にのみ参加できます。",
+    "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)が発生しました。この情報を部屋の管理者に伝えてみてはどうでしょうか。",
+    "Something went wrong with your invite to %(roomName)s": "%(roomName)s への招待に問題が発生しました",
+    "You were banned from %(roomName)s by %(memberName)s": "%(memberName)s により %(roomName)s からあなたは禁止されました",
+    "Re-join": "再参加",
+    "Reason: %(reason)s": "理由: %(reason)s",
+    "You were kicked from %(roomName)s by %(memberName)s": "%(memberName)s により %(roomName)s からあなたは蹴り出されました",
+    "Loading room preview": "部屋プレビューのロード中",
+    "Sign Up": "サインアップ",
+    "Join the conversation with an account": "アカウントで会話に参加する",
+    "Rejecting invite …": "招待を拒否する…",
+    "%(count)s results|one": "%(count)s 件の結果",
+    "%(count)s results|other": "%(count)s 件の結果",
+    "Use the + to make a new room or explore existing ones below": "+を使って新しい部屋を作成するか、以下の既存の部屋を探索します",
+    "Explore all public rooms": "すべての公開ルームを探索する",
+    "Start a new chat": "新しいチャットを開始します",
+    "Can't see what you’re looking for?": "探しているものが見つかりませんか?",
+    "Custom Tag": "カスタムタグ",
+    "Explore public rooms": "公開ルームを探索する",
+    "Discovery options will appear once you have added a phone number above.": "上記の電話番号を追加すると Discovery オプションが表示されます。",
+    "Verification code": "確認コード",
+    "Please enter verification code sent via text.": "テキストで送信された確認コードを入力してください。",
+    "Unable to verify phone number.": "電話番号を検証できません。",
+    "Unable to share phone number": "電話番号を共有できません",
+    "Unable to revoke sharing for phone number": "電話番号の共有を取り消せません",
+    "Discovery options will appear once you have added an email above.": "上記のメールを追加すると Discovery オプションが表示されます。",
+    "Share": "共有",
+    "Revoke": "取り消す",
+    "Complete": "完了",
+    "Verify the link in your inbox": "受信したメールの検証リンクを開いてください",
+    "Click the link in the email you received to verify and then click continue again.": "受信したメール中のリンクを開いて検証して、その後に「続ける」を押します。",
+    "Your email address hasn't been verified yet": "あなたのメールアドレスはまだ検証されていません",
+    "Unable to share email address": "メールアドレスを共有できません",
+    "Unable to revoke sharing for email address": "メールアドレスの共有を取り消せません",
+    "To link to this room, please add an address.": "この部屋にリンクするにはアドレスを追加してください。",
+    "Send %(eventType)s events": "%(eventType)s イベントを送信します",
+    "Remove messages sent by others": "他の人から送信されたメッセージを削除する",
+    "An error occurred changing the user's power level. Ensure you have sufficient permissions and try again.": "ユーザーのパワーレベルの変更中にエラーが発生しました。 十分な権限があることを確認して、再試行してください。",
+    "Uploaded sound": "アップロードされたサウンド",
+    "Bridges": "ブリッジ",
+    "This room isn’t bridging messages to any platforms. <a>Learn more.</a>": "この部屋はどのプラットフォームともメッセージをブリッジしていません。<a>詳細</a>",
+    "This room is bridging messages to the following platforms. <a>Learn more.</a>": "この部屋は以下のプラットフォームにメッセージをブリッジしています。 <a>詳細</a>",
+    "View older messages in %(roomName)s.": "%(roomName)s の古いメッセージを表示します。",
+    "this room": "この部屋",
+    "Upgrade this room to the recommended room version": "この部屋を推奨部屋バージョンにアップグレードします",
+    "<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> 古いバージョンのルームの新しいルームへのリンクを投稿します。ルームメンバーは、このリンクをクリックして新しいルームに参加する必要があります。",
+    "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "サーバー管理者は、プライベートな部屋とダイレクトメッセージでデフォルトでエンドツーエンド暗号化を無効にしています。",
+    "Accept all %(invitedRooms)s invites": "%(invitedRooms)s の招待を全て受け入れる",
+    "Read Marker off-screen lifetime (ms)": "既読マーカーを動かすまでの時間(画面オフ時)(ミリ秒)",
+    "Read Marker lifetime (ms)": "既読マーカーを動かすまでの時間(ミリ秒)",
+    "Subscribe": "購読",
+    "Room ID or address of ban list": "禁止リストの部屋IDまたはアドレス",
+    "If this isn't what you want, please use a different tool to ignore users.": "これが希望どおりでない場合は、別のツールを使用してユーザーを無視してください。",
+    "Subscribing to a ban list will cause you to join it!": "禁止リストを購読するとあなたはその効果が得られます!",
+    "Subscribed lists": "購読リスト",
+    "eg: @bot:* or example.org": "例: @bot:* や example.org など",
+    "Server or user ID to ignore": "無視するサーバー/ユーザー ID",
+    "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.": "あなたの個人的な禁止リストはあなたがメッセージを見たくないすべてのユーザー/サーバーを保持します。 最初のユーザー/サーバーを無視すると、「マイ禁止リスト」という名前の新しい部屋が部屋リストに表示されます。この部屋から出ると禁止リストは効果を失います。",
+    "Personal ban list": "個人的な禁止リスト",
+    "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.": "人を無視することは、誰を禁止するかについての規則を含む禁止リストを通して行われます。 禁止リストに登録すると、そのリストによってブロックされたユーザー/サーバーが非表示になります。",
+    "Add users and servers you want to ignore here. Use asterisks to have %(brand)s match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.": "無視するユーザー/サーバーをここに追加します。 アスタリスクを使用して %(brand)s を任意の文字と一致させます。たとえば、 <code>@bot:*</code> は任意のサーバーで「bot」という名前のすべてのユーザーを無視します。",
+    "⚠ These settings are meant for advanced users.": "⚠これらの設定は、上級ユーザーを対象としています。",
+    "You are currently subscribed to:": "購読されています:",
+    "View rules": "ルールを表示",
+    "Unsubscribe": "購読の解除",
+    "You are not subscribed to any lists": "あなたはどのリストにも加入していません",
+    "You are currently ignoring:": "あなたは無視しています:",
+    "You have not ignored anyone.": "あなたは誰も無視していません。",
+    "User rules": "ユーザールール",
+    "Server rules": "サーバールール",
+    "Ban list rules - %(roomName)s": "禁止ルールのリスト - %(roomName)s",
+    "None": "なし",
+    "Please try again or view your console for hints.": "もう一度試すか、コンソールでヒントを確認してください。",
+    "Error unsubscribing from list": "リスト購読解除のエラー",
+    "Error removing ignored user/server": "ユーザー/サーバーの無視を除去する際のエラー",
+    "Please verify the room ID or address and try again.": "部屋のIDやアドレスを確認して、もう一度お試しください。",
+    "Error subscribing to list": "リスト購読のエラー",
+    "Something went wrong. Please try again or view your console for hints.": "何かがうまくいかなかった。 もう一度試すか、コンソールでヒントを確認してください。",
+    "Error adding ignored user/server": "ユーザー/サーバーの無視を追加する際のエラー",
+    "Ignored/Blocked": "無視/ブロック",
+    "Customise your experience with experimental labs features. <a>Learn more</a>.": "試験機能を使って利用経験を調整します。 <a>もっと見る</a>。",
+    "Chat with %(brand)s Bot": "%(brand)s ボットとチャットする",
+    "For help with using %(brand)s, click <a>here</a> or start a chat with our bot using the button below.": "%(brand)s の使用についてサポートが必要な場合は、 <a>こちら</a> をクリックするか、下のボタンを使用してボットとチャットを開始してください。",
+    "Discovery": "見つける",
+    "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "identity サーバー (%(serverName)s) の利用規約に同意して、メールアドレスや電話番号でユーザを見つけたり見つけられたり招待したりできるようにします。",
+    "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "パスワードは正常に変更されました。 他のセッションに再度ログインするまで、他のセッションでプッシュ通知を受信しません",
+    "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "システムにインストールされているフォントの名前を設定すると、 %(brand)s がそれを使おうとします。",
+    "Theme added!": "テーマが追加されました!",
+    "Error downloading theme information.": "テーマ情報のダウンロード中にエラーが発生しました。",
+    "Invalid theme schema.": "テーマスキーマが無効です。",
+    "Use between %(min)s pt and %(max)s pt": "%(min)s ～ %(max)s (pt)の間の数字を指定します",
+    "Custom font size can only be between %(min)s pt and %(max)s pt": "カスタムフォントサイズの指定(単位: point)は %(min)s ～ %(max)s の間にできます",
+    "Size must be a number": "サイズには数値を指定してください",
+    "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.": "identity サーバーから切断すると、連絡先を使ってユーザを見つけたり見つけられたり招待したりできなくなります。",
+    "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "現在 identity サーバーを使用していません。連絡先を使ってユーザを見つけたり見つけられたりするには identity サーバーを以下に追加します。",
+    "Identity Server": "identity サーバー",
+    "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "連絡先の検出に <server /> ではなく他の identity サーバーを使いたい場合は以下に指定してください。",
+    "You are currently using <server></server> to discover and be discoverable by existing contacts you know. You can change your identity server below.": "現在 <server></server> を使用して、連絡先を検出可能にしています。以下で identity サーバーを変更できます。",
+    "Identity Server (%(server)s)": "identity サーバー (%(server)s)",
+    "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "切断する前に、identity サーバーからメールアドレスと電話番号を削除することをお勧めします。",
+    "You are still <b>sharing your personal data</b> on the identity server <idserver />.": "まだ identity サーバー <idserver /> で<b>個人データを共有</b>しています。",
+    "Disconnect anyway": "とにかく切断します",
+    "wait and try again later": "しばらく待って、後でもう一度試す",
+    "contact the administrators of identity server <idserver />": "identity サーバー <idserver /> の管理者に連絡する",
+    "check your browser plugins for anything that might block the identity server (such as Privacy Badger)": "identity サーバーをブロックする可能性のあるもの(Privacy Badgerなど)がないか、ブラウザプラグインを確認してください",
+    "You should:": "するべきこと:",
+    "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.": "切断する前に identity サーバー <idserver /> から<b>個人データを削除</b>する必要があります。 しかし残念ながら identity サーバー <idserver /> は現在オフライン状態か、またはアクセスできません。",
+    "Disconnect": "切断する",
+    "Disconnect from the identity server <idserver />?": "identity サーバー <idserver /> から切断しますか?",
+    "Disconnect identity server": "identity サーバーを切断します",
+    "The identity server you have chosen does not have any terms of service.": "選択した identity サーバーには利用規約がありません。",
+    "Terms of service not accepted or the identity server is invalid.": "利用規約に同意していないか、identity サーバーが無効です。",
+    "Disconnect from the identity server <current /> and connect to <new /> instead?": "identity サーバー <current /> から切断して <new /> に接続しますか?",
+    "Change identity server": "identity サーバーを変更する",
+    "Checking server": "サーバーをチェックしています",
+    "Could not connect to Identity Server": "identity サーバーに接続できませんでした",
+    "Not a valid Identity Server (status code %(code)s)": "有効な identity サーバーではありません (ステータスコード %(code)s)",
+    "Identity Server URL must be HTTPS": "identityサーバーのURLは HTTPS スキーマである必要があります",
+    "not ready": "準備ができていない",
+    "ready": "準備ができました",
+    "unexpected type": "unexpected type",
+    "well formed": "well formed",
+    "Your keys are <b>not being backed up from this session</b>.": "キーは<b>このセッションからバックアップされていません</b>。",
+    "Backing up %(sessionsRemaining)s keys...": "%(sessionsRemaining)s キーをバックアップしています…",
+    "Unable to load key backup status": "キーのバックアップ状態を読み込めません",
+    "The operation could not be completed": "操作を完了できませんでした",
+    "Failed to save your profile": "プロファイルの保存に失敗しました",
+    "You might have configured them in a client other than %(brand)s. You cannot tune them in %(brand)s but they still apply.": "%(brand)s 以外のクライアントでそれらを構成した可能性があります。%(brand)sで変更することはできませんが適用されます。",
+    "There are advanced notifications which are not shown here.": "ここに表示されていない追加の通知があります。",
+    "Clear notifications": "通知をクリアする",
+    "The integration manager is offline or it cannot reach your homeserver.": "integration マネージャーがオフライン状態か、またはあなたのホームサーバに到達できません。",
+    "%(brand)s can't securely cache encrypted messages locally while running in a web browser. Use <desktopLink>%(brand)s Desktop</desktopLink> for encrypted messages to appear in search results.": "Webブラウザー上で動作する %(brand)s Web は暗号化メッセージの安全なキャッシュをローカルに保存できません。<desktopLink>%(brand)s Desktop</desktopLink> アプリを使うと暗号化メッセージを検索結果に表示することができます。",
+    "%(brand)s is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom %(brand)s Desktop with <nativeLink>search components added</nativeLink>.": "暗号化されたメッセージの安全なキャッシュをローカルに保存するためのいくつかのコンポーネントが %(brand)s にはありません。 この機能を試してみたい場合は、<nativeLink>検索コンポーネントが追加された </nativeLink> %(brand)s デスクトップのカスタム版をビルドしてください。",
+    "Securely cache encrypted messages locally for them to appear in search results.": "暗号化メッセージの安全なキャッシュをローカルに保存して、検索結果に表示できるようにします。",
+    "Delete sessions|one": "セッションを削除する",
+    "Delete sessions|other": "セッションを削除する",
+    "Click the button below to confirm deleting these sessions.|one": "下のボタンをクリックしてこのセッションの削除を確認してください。",
+    "Click the button below to confirm deleting these sessions.|other": "下のボタンをクリックしてこれらのセッションの削除を確認してください。",
+    "Confirm deleting these sessions": "これらのセッションの削除を確認してください",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|one": "あなたのidentityを確認するためシングルサインオンを使いこのセッションを削除することを確認します。",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|other": "あなたのidentityを調べるためにシングルサインオンを使いこれらのセッションを削除することを確認します。",
+    "not found in storage": "ストレージには見つかりません",
+    "Set up": "設定する",
+    "Cross-signing is not set up.": "クロス署名が設定されていません。",
+    "Passwords don't match": "パスワードが一致しません",
+    "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.": "パスワードを変更すると全てのセッションでエンドツーエンド暗号化キーがリセットされて暗号化されたチャット履歴が読み取れなくなります。将来的にはこれは改善される見込みですが、現時点では、パスワード変更の前に部屋のキーをエクスポートして後で再インポートすることを検討してください。",
+    "Channel: <channelLink/>": "Channel: <channelLink/>",
+    "Workspace: <networkLink/>": "Workspace: <networkLink/>",
+    "This bridge is managed by <user />.": "このブリッジは<user />により管理されています。",
+    "This bridge was provisioned by <user />.": "このブリッジは<user />により提供されました。",
+    "Decline (%(counter)s)": "Decline (%(counter)s)",
+    "From %(deviceName)s (%(deviceId)s)": "From %(deviceName)s (%(deviceId)s)",
+    "Your server isn't responding to some <a>requests</a>.": "あなたのサーバは数回の<a>リクエスト</a>に応答しません。",
+    "Pin": "ピン",
+    "Folder": "フォルダー",
+    "Headphones": "ヘッドホン",
+    "Anchor": "錨",
+    "Bell": "鐘",
+    "Trumpet": "トランペット",
+    "Guitar": "ギター",
+    "Ball": "ボール",
+    "Trophy": "トロフィー",
+    "Rocket": "ロケット",
+    "Aeroplane": "飛行機",
+    "Bicycle": "自転車",
+    "Train": "列車",
+    "Flag": "旗",
+    "Telephone": "電話",
+    "Hammer": "ハンマー",
+    "Key": "鍵",
+    "Lock": "錠前",
+    "Scissors": "鋏",
+    "Paperclip": "紙ばさみ",
+    "Pencil": "鉛筆",
+    "Book": "本",
+    "Light bulb": "電球",
+    "Gift": "ギフト",
+    "Clock": "時計",
+    "Hourglass": "砂時計",
+    "Umbrella": "傘",
+    "Thumbs up": "サムズアップ",
+    "Santa": "サンタ",
+    "Spanner": "スパナ",
+    "Glasses": "眼鏡",
+    "Hat": "帽子",
+    "Robot": "ロボット",
+    "Smiley": "笑顔",
+    "Heart": "ハート",
+    "Cake": "ケーキ",
+    "Pizza": "ピザ",
+    "Corn": "トウモロコシ",
+    "Strawberry": "苺",
+    "Apple": "林檎",
+    "Banana": "バナナ",
+    "Fire": "炎",
+    "Cloud": "雲",
+    "Moon": "月",
+    "Globe": "金魚鉢",
+    "Mushroom": "茸",
+    "Cactus": "サボテン",
+    "Tree": "木",
+    "Flower": "花",
+    "Butterfly": "蝶",
+    "Octopus": "蛸",
+    "Fish": "魚",
+    "Turtle": "亀",
+    "Penguin": "ペンギン",
+    "Rooster": "鶏",
+    "Panda": "パンダ",
+    "Rabbit": "兎",
+    "Elephant": "象",
+    "Pig": "豚",
+    "Unicorn": "一角獣",
+    "Horse": "馬",
+    "Lion": "ライオン",
+    "Cat": "猫",
+    "Dog": "犬",
+    "To be secure, do this in person or use a trusted way to communicate.": "安全を確保するため、1人でこれを行うか、または信頼できる方法で連携してください。",
+    "They don't match": "それらは一致しません",
+    "They match": "それらは一致します",
+    "Cancelling…": "取り消し中…",
+    "Waiting for your other session to verify…": "他のセッションによる検証を待っています…",
+    "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "他のセッション %(deviceName)s (%(deviceId)s) による検証を待っています…",
+    "Unable to find a supported verification method.": "どの検証方法にも対応していません。",
+    "Verify this user by confirming the following number appears on their screen.": "このユーザを検証するため、両方の画面に同じ番号が表示されていることを確認してください。",
+    "The user must be unbanned before they can be invited.": "招待する前にユーザの禁止を解除する必要があります。",
+    "Unrecognised address": "認識されないアドレス",
+    "Error leaving room": "部屋を出る際のエラー",
+    "Unexpected server error trying to leave the room": "部屋を出る際に予期しないサーバーエラー",
+    "The message you are trying to send is too large.": "送信しようとしているメッセージが大きすぎます。",
+    "Unexpected error resolving identity server configuration": "identity サーバー構成の解釈中に予期しないエラーが発生しました",
+    "Unexpected error resolving homeserver configuration": "ホームサーバー構成の解釈中に予期しないエラーが発生しました",
+    "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.": "あなたはログインできますが、identity サーバーがオンラインに戻るまで一部の機能を使用できません。 この警告が引き続き表示される場合は、構成を確認するか、サーバー管理者に連絡してください。",
+    "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.": "あなたはパスワードをリセットできますが、identity サーバーがオンラインに復帰するまで一部の機能を使用できません。 この警告が引き続き表示される場合は、構成を確認するか、サーバー管理者に連絡してください。",
+    "You can register, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "あなたは登録できますが、identity サーバーがオンラインに復帰するまで一部の機能は使用できません。 この警告が引き続き表示される場合は、構成を確認するか、サーバー管理者に連絡してください。",
+    "Ask your %(brand)s admin to check <a>your config</a> for incorrect or duplicate entries.": "<a>設定</a>が間違っているか重複しているか確認するよう、%(brand)s の管理者に問い合わせてください。",
+    "Ensure you have a stable internet connection, or get in touch with the server admin": "安定したインターネット接続があることを確認するか、サーバー管理者に連絡してください",
+    "See <b>%(msgtype)s</b> messages posted to your active room": "アクティブな部屋に送られた <b>%(msgtype)s</b> メッセージを見る",
+    "See <b>%(msgtype)s</b> messages posted to this room": "部屋に送られた <b>%(msgtype)s</b> メッセージを見る",
+    "Send <b>%(msgtype)s</b> messages as you in your active room": "あなたとしてアクティブな部屋に <b>%(msgtype)s</b> メッセージを送る",
+    "Send <b>%(msgtype)s</b> messages as you in this room": "あなたとして部屋に <b>%(msgtype)s</b> メッセージを送る",
+    "See general files posted to your active room": "アクティブな部屋に送られたファイルを見る",
+    "See general files posted to this room": "部屋に送られたファイルを見る",
+    "Send general files as you in your active room": "あなたとしてアクティブな部屋にファイルを送る",
+    "Send general files as you in this room": "あなたとしてファイルを部屋に送る",
+    "See videos posted to this room": "部屋に送られた動画を見る",
+    "See videos posted to your active room": "アクティブな部屋に送られた動画を見る",
+    "Send videos as you in your active room": "あなたとしてアクティブな部屋に画像を送る",
+    "Send videos as you in this room": "あなたとして部屋に動画を送る",
+    "See images posted to your active room": "アクティブな部屋に送られた画像を見る",
+    "See images posted to this room": "部屋に送られた画像を見る",
+    "Send images as you in your active room": "あなたとしてアクティブな部屋に画像を送る",
+    "Send images as you in this room": "あなたとして部屋に画像を送る",
+    "See emotes posted to your active room": "アクティブな部屋に送られたエモートを見る",
+    "See emotes posted to this room": "部屋に送られたエモートを見る",
+    "Send emotes as you in your active room": "あなたとしてアクティブな部屋にエモートを送る",
+    "Send emotes as you in this room": "あなたとして部屋にエモートを送る",
+    "See text messages posted to your active room": "アクティブな部屋に送られたテキストメッセージを見る",
+    "See text messages posted to this room": "部屋に送られたテキストメッセージを見る",
+    "Send text messages as you in your active room": "あなたとしてアクティブな部屋にメッセージを送る",
+    "Send text messages as you in this room": "あなたとしてテキストメッセージを部屋に送る",
+    "See messages posted to your active room": "アクティブな部屋に送られたメッセージを見る",
+    "See messages posted to this room": "部屋に送られたメッセージを見る",
+    "Send messages as you in your active room": "あなたとしてメッセージをアクティブな部屋に送る",
+    "Send messages as you in this room": "あなたとしてメッセージを部屋に送る",
+    "The <b>%(capability)s</b> capability": "<b>%(capability)s</b> 機能",
+    "See <b>%(eventType)s</b> events posted to your active room": "アクティブな部屋に送られたイベント <b>%(eventType)s</b> を見る",
+    "Send <b>%(eventType)s</b> events as you in your active room": "あなたとしてイベント <b>%(eventType)s</b> をアクティブな部屋に送る",
+    "See <b>%(eventType)s</b> events posted to this room": "この部屋に送られたイベント <b>%(eventType)s</b> を見る",
+    "Send <b>%(eventType)s</b> events as you in this room": "あなたとしてイベント <b>%(eventType)s</b> をこの部屋に送る",
+    "with state key %(stateKey)s": "ステートキー %(stateKey)s と共に",
+    "with an empty state key": "空のステートキーと共に",
+    "See when anyone posts a sticker to your active room": "アクティブな部屋にステッカーが送られた時刻を見る",
+    "Send stickers to your active room as you": "あなたとしてアクティブな部屋にステッカーを送る",
+    "See when a sticker is posted in this room": "部屋にステッカーが投稿された時刻を見る",
+    "Send stickers to this room as you": "あなたとして部屋にステッカーを送る",
+    "See when the avatar changes in your active room": "アクティブな部屋でアバターが変わった時刻を見る",
+    "Change the avatar of your active room": "アクティブな部屋のアバター画像を変える",
+    "See when the avatar changes in this room": "部屋のアバター画像が変わった時刻を見る",
+    "Change the avatar of this room": "部屋のアバター画像を変える",
+    "See when the name changes in your active room": "アクティブな部屋で名前が変わった時刻を見る",
+    "Change the name of your active room": "アクティブな部屋の名前を変える",
+    "See when the name changes in this room": "部屋の名前が変わった時刻を見る",
+    "Change the name of this room": "部屋の名前を変える",
+    "See when the topic changes in your active room": "アクティブな部屋でトピックが変わった時刻を見る",
+    "Change the topic of your active room": "アクティブな部屋のトピックを変える",
+    "See when the topic changes in this room": "部屋のトピックが変わった時刻を見る",
+    "Change the topic of this room": "部屋のトピックを変える",
+    "Change which room, message, or user you're viewing": "表示する部屋/メッセージ/ユーザを変える",
+    "Change which room you're viewing": "表示する部屋を変える",
+    "Send stickers into your active room": "アクティブな部屋にステッカーを送る",
+    "Send stickers into this room": "この部屋にステッカーを送る",
+    "Remain on your screen while running": "実行中は画面に留める",
+    "Remain on your screen when viewing another room, when running": "他の部屋を表示してる間も実行中は画面に留める",
+    "Ask this user to verify their session, or manually verify it below.": "このユーザーに彼らのセッションを検証するよう問い合わせるか、以下のように手動で検証してください。",
+    "Verify your other session using one of the options below.": "以下のどれか一つを使って他のセッションを検証します。",
+    "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)sは禁止ルール %(oldGlob)s を %(newGlob)s (理由 %(reason)s)に変更しました",
+    "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s はサーバ禁止ルール %(oldGlob)s を %(newGlob)s (理由 %(reason)s) に変更しました",
+    "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s は部屋の禁止ルール %(oldGlob)s を %(newGlob)s (理由 %(reason)s) に変更しました",
+    "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s はユーザ禁止ルール %(oldGlob)s を %(newGlob)s (理由 %(reason)s) に変更しました",
+    "%(senderName)s created a ban rule matching %(glob)s for %(reason)s": "%(senderName)s は禁止ルール %(glob)s (理由 %(reason)s)を作成しました",
+    "%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s はサーバ禁止ルール %(glob)s (理由 %(reason)s)を作成しました",
+    "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s は部屋の禁止ルール %(glob)s (理由 %(reason)s)を作成しました",
+    "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s はユーザ禁止ルール %(glob)s (理由 %(reason)s)を作成しました",
+    "%(senderName)s updated a ban rule matching %(glob)s for %(reason)s": "%(senderName)s は禁止ルール %(glob)s （理由 %(reason)s)を更新しました",
+    "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s はサーバ禁止ルール %(glob)s （理由 %(reason)s)を更新しました",
+    "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s は部屋の禁止ルール %(glob)s (理由 %(reason)s)を更新しました",
+    "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s はユーザ禁止ルール %(glob)s (理由 %(reason)s)を更新しました",
+    "%(senderName)s updated an invalid ban rule": "%(senderName)s はinvalidな禁止ルールを更新しました",
+    "%(senderName)s removed a ban rule matching %(glob)s": "%(senderName)s は 禁止ルール %(glob)s を削除しました",
+    "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s はサーバ禁止ルール %(glob)s を削除しました",
+    "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s は部屋の禁止ルール %(glob)s を削除しました",
+    "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s はユーザー禁止ルール %(glob)s を削除しました",
+    "%(senderName)s has updated the widget layout": "%(senderName)s はウィジェットのレイアウトを更新しました",
+    "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s は部屋 %(targetDisplayName)s への招待を取り消しました。",
+    "%(senderName)s declined the call.": "%(senderName)s は通話を拒否しました。",
+    "(an error occurred)": "(エラーが発生しました)",
+    "(their device couldn't start the camera / microphone)": "(彼らのデバイスはカメラ/マイクを使用できませんでした)",
+    "(connection failed)": "(接続に失敗しました)",
+    "%(senderName)s changed the addresses for this room.": "%(senderName)s がこの部屋のアドレスを変更しました。",
+    "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s がこの部屋のメインアドレスと代替アドレスを変更しました。",
+    "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s がこの部屋の代替アドレスを変更しました。",
+    "%(senderName)s removed 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 added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s がこの部屋の代替アドレス %(addresses)s を追加しました。",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s がこの部屋の代替アドレス %(addresses)s を追加しました。",
+    "🎉 All servers are banned from participating! This room can no longer be used.": "🎉すべてのサーバーは参加を禁止されています! この部屋は使用できなくなりました。",
+    "%(senderDisplayName)s changed the server ACLs for this room.": "%(senderDisplayName)s がこの部屋のサーバーACLを変更しました。",
+    "%(senderDisplayName)s set the server ACLs for this room.": "%(senderDisplayName)s がこの部屋のサーバーACLを設定しました。",
+    "Converts the DM to a room": "DMを部屋に変換します",
+    "Converts the room to a DM": "部屋をDMに変換します",
+    "Takes the call in the current room off hold": "現在の部屋の通話を保留から外します",
+    "Places the call in the current room on hold": "保留中の現在の部屋に通話を発信します",
+    "Sends a message to the given user": "指定されたユーザーにメッセージを送ります",
+    "Opens chat with the given user": "指定されたユーザーとのチャットを開きます",
+    "Send a bug report with logs": "ログ付きのバグ報告を送る",
+    "Displays information about a user": "ユーザーの情報を表示します",
+    "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 から受け取ったキーと一致します。セッションは検証済みです。",
+    "Unknown (user, session) pair:": "ユーザーとセッションのペアが不明です:",
+    "Verifies a user, session, and pubkey tuple": "ユーザー、セッション、およびpubkeyタプルを検証します",
+    "Please supply a widget URL or embed code": "ウィジェットのURLまたは埋め込みコードを入力してください",
+    "Could not find user in room": "部屋にユーザーが見つかりません",
+    "Command failed": "コマンドが失敗しました",
+    "Unrecognised room address:": "部屋のアドレスを認識できません:",
+    "Joins room with given address": "指定されたアドレスの部屋に参加します",
+    "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "メールでの招待に identity サーバーを使います。デフォルトの identity サーバー (%(defaultIdentityServerName)s) を使う場合は「続ける」を押してください。または設定画面を開いて変更してください。",
+    "Failed to set topic": "トピックの設定に失敗しました",
+    "Double check that your server supports the room version chosen and try again.": "選択した部屋のバージョンをあなたのサーバーがサポートしているか何度も確認してから、もう一度試してください。",
+    "Sends a message as html, without interpreting it as markdown": "メッセージを(Markdownではなく)HTMLとして送信します",
+    "Prepends ( ͡° ͜ʖ ͡°) to a plain-text message": "プレーンテキストメッセージの前に ( ͡° ͜ʖ ͡°) を付けます",
+    "Prepends ┬──┬ ノ( ゜-゜ノ) to a plain-text message": "プレーンテキストメッセージの前に ┬──┬ ノ( ゜-゜ノ) を付けます",
+    "Prepends (╯°□°）╯︵ ┻━┻ to a plain-text message": "プレーンテキストメッセージの前に (╯°□°）╯︵ ┻━┻ を付けます",
+    "Effects": "効果",
+    "Setting up keys": "キーのセットアップ",
+    "Are you sure you want to cancel entering passphrase?": "パスフレーズの入力をキャンセルしてもよいですか?",
+    "Cancel entering passphrase?": "パスフレーズの入力をキャンセルしますか?",
+    "Custom (%(level)s)": "カスタム(%(level)s)",
+    "Use your account or create a new one to continue.": "作成ずみのアカウントを使うか、新しいアカウントを作成して続けます。",
+    "Sign In or Create Account": "サインインまたはアカウントの作成",
+    "Zimbabwe": "ジンバブエ",
+    "Zambia": "ザンビア",
+    "Yemen": "イエメン",
+    "Western Sahara": "西サハラ",
+    "Wallis & Futuna": "ウォリス・フツナ",
+    "Vietnam": "ベトナム",
+    "Venezuela": "ベネズエラ",
+    "Vatican City": "バチカン市",
+    "Vanuatu": "バヌアツ",
+    "Uzbekistan": "ウズベキスタン",
+    "Uruguay": "ウルグアイ",
+    "United Arab Emirates": "アラブ首長国連邦",
+    "Ukraine": "ウクライナ",
+    "Uganda": "ウガンダ",
+    "U.S. Virgin Islands": "アメリカ領バージン諸島",
+    "Tuvalu": "ツバル",
+    "Turks & Caicos Islands": "タークス・カイコス諸島",
+    "Turkmenistan": "トルクメニスタン",
+    "Turkey": "トルコ",
+    "Tunisia": "チュニジア",
+    "Trinidad & Tobago": "トリニダード・トバゴ",
+    "Tonga": "トンガ",
+    "Tokelau": "トケラウ",
+    "Togo": "トーゴ",
+    "Timor-Leste": "東ティモール",
+    "Thailand": "タイ",
+    "Tanzania": "タンザニア",
+    "Tajikistan": "タジキスタン",
+    "Taiwan": "台湾",
+    "São Tomé & Príncipe": "サントメ・プリンシペ",
+    "Syria": "シリア",
+    "Switzerland": "スイス",
+    "Sweden": "スウェーデン",
+    "Swaziland": "スワジランド",
+    "Svalbard & Jan Mayen": "スバールバル＆ヤンマイエン",
+    "Suriname": "スリナム",
+    "Sudan": "スーダン",
+    "St. Vincent & Grenadines": "セントビンセント&グレナディーン諸島",
+    "St. Pierre & Miquelon": "サンピエール島ミクロン島",
+    "St. Martin": "セントマーチン",
+    "St. Lucia": "セントルシア",
+    "St. Kitts & Nevis": "セントクリストファー・ネイビス",
+    "St. Helena": "セントヘレナ",
+    "St. Barthélemy": "サン・バルテルミー島",
+    "Sri Lanka": "スリランカ",
+    "Spain": "スペイン",
+    "South Sudan": "南スーダン",
+    "South Korea": "韓国",
+    "South Georgia & South Sandwich Islands": "南ジョージア&南サンドイッチ諸島",
+    "Explore community rooms": "コミュニティルームを探索する",
+    "Open dial pad": "ダイヤルパッドを開く",
+    "Start a Conversation": "会話を始める",
+    "Show Widgets": "ウィジェットを表示する",
+    "Hide Widgets": "ウィジェットを隠す",
+    "No recently visited rooms": "最近訪れた部屋はありません",
+    "Recently visited rooms": "最近訪れた部屋",
+    "Room %(name)s": "部屋 %(name)s",
+    "Code block": "コードブロック",
+    "Strikethrough": "取り消し線",
+    "The authenticity of this encrypted message can't be guaranteed on this device.": "この暗号化メッセージの信頼性はこのデバイスでは保証できません。",
+    "Mod": "Mod",
+    "Edit message": "メッセージの編集",
+    "Someone is using an unknown session": "誰かが不明なセッションを使用しています",
+    "You have verified this user. This user has verified all of their sessions.": "このユーザーを検証しました。このユーザは全てのセッションを検証しました。",
+    "You have not verified this user.": "あなたはこのユーザーを検証していません。",
+    "This user has not verified all of their sessions.": "このユーザーはすべてのセッションを確認していません。",
+    "Phone Number": "電話番号",
+    "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "+%(msisdn)s にテキストメッセージを送りました。メッセージに含まれた確認コードを入力してください。",
+    "Remove %(phone)s?": "%(phone)s を除去しますか?",
+    "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.": "アドレスを確認するためメールを送りました。そこにある手順に従い、その後に下のボタンを押してください。",
+    "Remove %(email)s?": "%(email)s を除去しますか?",
+    "South Africa": "南アフリカ",
+    "Somalia": "ソマリア",
+    "Solomon Islands": "ソロモン諸島",
+    "Slovenia": "スロベニア",
+    "Slovakia": "スロバキア",
+    "Sint Maarten": "シントマールテン",
+    "Singapore": "シンガポール",
+    "Sierra Leone": "シエラレオネ",
+    "Seychelles": "セイシェル",
+    "Serbia": "セルビア",
+    "Senegal": "セネガル",
+    "Saudi Arabia": "サウジアラビア",
+    "San Marino": "サンマリノ",
+    "Samoa": "サモア",
+    "Réunion": "レユニオン",
+    "Rwanda": "ルワンダ",
+    "Russia": "ロシア",
+    "Romania": "ルーマニア",
+    "Qatar": "カタール",
+    "Puerto Rico": "プエルトリコ",
+    "Portugal": "ポルトガル",
+    "Poland": "ポーランド",
+    "Pitcairn Islands": "ピトケアン諸島",
+    "Philippines": "フィリピン",
+    "Peru": "ペルー",
+    "Paraguay": "パラグアイ",
+    "Papua New Guinea": "パプアニューギニア",
+    "Panama": "パナマ",
+    "Palestine": "パレスチナ",
+    "Palau": "パラオ",
+    "Pakistan": "パキスタン",
+    "Oman": "オマーン",
+    "Norway": "ノルウェー",
+    "Northern Mariana Islands": "北マリアナ諸島",
+    "North Korea": "北朝鮮",
+    "Norfolk Island": "ノーフォーク島",
+    "Niue": "ニウエ",
+    "Nigeria": "ナイジェリア",
+    "Niger": "ニジェール",
+    "Nicaragua": "ニカラグア",
+    "New Zealand": "ニュージーランド",
+    "New Caledonia": "ニューカレドニア",
+    "Netherlands": "オランダ",
+    "Nepal": "ネパール",
+    "Nauru": "ナウル",
+    "Namibia": "ナミビア",
+    "Myanmar": "ミャンマー",
+    "Mozambique": "モザンビーク",
+    "Morocco": "モロッコ",
+    "Montserrat": "モントセラト",
+    "Montenegro": "モンテネグロ",
+    "Mongolia": "モンゴル",
+    "Monaco": "モナコ",
+    "Moldova": "モルドバ",
+    "Micronesia": "ミクロネシア",
+    "Mexico": "メキシコ",
+    "Mayotte": "マヨット",
+    "Mauritius": "モーリシャス",
+    "Mauritania": "モーリタニア",
+    "Martinique": "マルティニーク",
+    "Marshall Islands": "マーシャル諸島",
+    "Malta": "マルタ",
+    "Mali": "マリ",
+    "Maldives": "モルディブ",
+    "Malaysia": "マレーシア",
+    "Malawi": "マラウイ",
+    "Madagascar": "マダガスカル",
+    "Macedonia": "マケドニア",
+    "Macau": "マカオ",
+    "Luxembourg": "ルクセンブルク",
+    "Lithuania": "リトアニア",
+    "Liechtenstein": "リヒテンシュタイン",
+    "Libya": "リビア",
+    "Liberia": "リベリア",
+    "Lesotho": "レソト",
+    "Lebanon": "レバノン",
+    "Latvia": "ラトビア",
+    "Laos": "ラオス",
+    "Kyrgyzstan": "キルギスタン",
+    "Kuwait": "クウェート",
+    "Kosovo": "コソボ",
+    "Kiribati": "キリバス",
+    "Kenya": "ケニア",
+    "Kazakhstan": "カザフスタン",
+    "Jordan": "ヨルダン",
+    "Jersey": "ジャージー",
+    "Japan": "日本",
+    "Jamaica": "ジャマイカ",
+    "Italy": "イタリア",
+    "Israel": "イスラエル",
+    "Isle of Man": "マン島",
+    "Ireland": "アイルランド",
+    "Iraq": "イラク",
+    "Iran": "イラン",
+    "Indonesia": "インドネシア",
+    "India": "インド",
+    "Iceland": "アイスランド",
+    "Hungary": "ハンガリー",
+    "Hong Kong": "香港",
+    "Honduras": "ホンジュラス",
+    "Heard & McDonald Islands": "ハード島とマクドナルド諸島",
+    "Haiti": "ハイチ",
+    "Guyana": "ガイアナ",
+    "Guinea-Bissau": "ギニアビサウ",
+    "Guinea": "ギニア",
+    "Guernsey": "ガーンジー",
+    "Guatemala": "グアテマラ",
+    "Guam": "グアム",
+    "Guadeloupe": "グアドループ",
+    "Grenada": "グレナダ",
+    "Greenland": "グリーンランド",
+    "Greece": "ギリシャ",
+    "Gibraltar": "ジブラルタル",
+    "Ghana": "ガーナ",
+    "Germany": "ドイツ",
+    "Georgia": "ジョージア",
+    "Gambia": "ガンビア",
+    "Gabon": "ガボン",
+    "French Southern Territories": "フランス領南方領土",
+    "French Polynesia": "フランス領ポリネシア",
+    "French Guiana": "フランス領ギアナ",
+    "France": "フランス",
+    "Finland": "フィンランド",
+    "Fiji": "フィジー",
+    "Faroe Islands": "フェロー諸島",
+    "Falkland Islands": "フォークランド諸島",
+    "Ethiopia": "エチオピア",
+    "Estonia": "エストニア",
+    "Eritrea": "エリトリア",
+    "Equatorial Guinea": "赤道ギニア",
+    "El Salvador": "エルサルバドル",
+    "Egypt": "エジプト",
+    "Ecuador": "エクアドル",
+    "Dominican Republic": "ドミニカ共和国",
+    "Dominica": "ドミニカ",
+    "Djibouti": "ジブチ",
+    "Denmark": "デンマーク",
+    "Côte d’Ivoire": "コートジボワール",
+    "Czech Republic": "チェコ共和国",
+    "Cyprus": "キプロス",
+    "Curaçao": "キュラソー",
+    "Cuba": "キューバ",
+    "Croatia": "クロアチア",
+    "Costa Rica": "コスタリカ",
+    "Cook Islands": "クック諸島",
+    "Congo - Kinshasa": "コンゴ-キンシャサ",
+    "Congo - Brazzaville": "コンゴ-ブラザビル",
+    "Comoros": "コモロ",
+    "Colombia": "コロンビア",
+    "Cocos (Keeling) Islands": "ココス(キーリング)諸島",
+    "Christmas Island": "クリスマス島",
+    "China": "中国",
+    "Chile": "チリ",
+    "Chad": "チャド",
+    "Central African Republic": "中央アフリカ共和国",
+    "Cayman Islands": "ケイマン諸島",
+    "Caribbean Netherlands": "カリブ海オランダ",
+    "Cape Verde": "カーボベルデ",
+    "Canada": "カナダ",
+    "Cameroon": "カメルーン",
+    "Cambodia": "カンボジア",
+    "Burundi": "ブルンジ",
+    "Burkina Faso": "ブルキナファソ",
+    "Bulgaria": "ブルガリア",
+    "Brunei": "ブルネイ",
+    "British Virgin Islands": "イギリス領ヴァージン諸島",
+    "British Indian Ocean Territory": "イギリス領インド洋地域",
+    "Brazil": "ブラジル",
+    "Bouvet Island": "ブーベ島",
+    "Botswana": "ボツワナ",
+    "Bosnia": "ボスニア",
+    "Bolivia": "ボリビア",
+    "Bhutan": "ブータン",
+    "Bermuda": "バミューダ",
+    "Benin": "ベナン",
+    "Belize": "ベリーズ",
+    "Belgium": "ベルギー",
+    "Belarus": "ベラルーシ",
+    "Barbados": "バルバドス",
+    "Bangladesh": "バングラデシュ",
+    "Bahrain": "バーレーン",
+    "Bahamas": "バハマ",
+    "Azerbaijan": "アゼルバイジャン",
+    "Austria": "オーストリア",
+    "Australia": "オーストラリア",
+    "Aruba": "アルバ",
+    "Armenia": "アルメニア",
+    "Argentina": "アルゼンチン",
+    "Antigua & Barbuda": "アンティグア&バーブーダ",
+    "Antarctica": "南極大陸",
+    "Anguilla": "アンギラ",
+    "Angola": "アンゴラ",
+    "Andorra": "アンドラ",
+    "American Samoa": "アメリカ領サモア",
+    "Algeria": "アルジェリア",
+    "Albania": "アルバニア",
+    "Åland Islands": "オーランド諸島",
+    "Afghanistan": "アフガニスタン",
+    "United States": "アメリカ",
+    "United Kingdom": "イギリス",
+    "%(name)s is requesting verification": "%(name)s は検証を要望しています",
+    "Your homeserver rejected your log in attempt. This could be due to things just taking too long. Please try again. If this continues, please contact your homeserver administrator.": "ホームサーバーがログインの試行を拒否しました。時間がかかりすぎたことが原因かもしれません。もう一度やり直してください。これが続く場合はホームサーバー管理者に連絡してください。",
+    "Your homeserver was unreachable and was not able to log you in. Please try again. If this continues, please contact your homeserver administrator.": "ホームサーバーにアクセスできませんでした。もう一度やり直してください。これが続く場合はホームサーバー管理者に連絡してください。",
+    "Try again": "もう一度試す",
+    "We asked the browser to remember which homeserver you use to let you sign in, but unfortunately your browser has forgotten it. Go to the sign in page and try again.": "残念ながらブラウザはサインインするホームサーバーを忘れてしまいました。 サインインページに移動して再試行してください。",
+    "We couldn't log you in": "ログインできませんでした",
+    "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.": "このアクションはデフォルトのidentity サーバー <server /> にアクセスしてメールアドレスまたは電話番号を検証する必要がありますが、サーバには利用規約がありません。",
+    "Room name or address": "部屋の名前またはアドレス",
+    "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "現時点ではファイルで返信することはできません。 返信せずにこのファイルをアップロードしますか?",
+    "This will end the conference for everyone. Continue?": "これは全員の会議を終了させます。続けますか?",
+    "End conference": "会議を終了する",
+    "You've reached the maximum number of simultaneous calls.": "同時通話数の上限に達しました。",
+    "Too Many Calls": "通話が多すぎます",
+    "No other application is using the webcam": "他のアプリがWebカメラを使用中ではないこと",
+    "Permission is granted to use the webcam": "Webカメラを使う権限が与えられていること",
+    "A microphone and webcam are plugged in and set up correctly": "マイクとWebカメラが接続されていて、正しく設定されていること",
+    "Verify this user by confirming the following emoji appear on their screen.": "このユーザを検証するため、両方の画面に絵文字が同じ順序で表示されていることを確認してください。",
+    "Verify this session by confirming the following number appears on its screen.": "このセッションを検証するため、同じ番号が両方の画面に表示されていることを確認してください。",
+    "Confirm the emoji below are displayed on both sessions, in the same order:": "以下の絵文字が両方のセッションで同じ順序で表示されていることをしてください:",
+    "Start": "開始",
+    "Compare a unique set of emoji if you don't have a camera on either device": "両方の端末でQRコードをキャプチャできない場合、絵文字の比較を選んでください",
+    "Compare unique emoji": "絵文字の並びを比較する",
+    "or": "または",
+    "Scan this unique code": "ユニークなコードをスキャン",
+    "Verify this session by completing one of the following:": "以下のどれか一つの方法で、このセッションを検証します。",
+    "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "ユーザ間でエンドツーエンド暗号化されたメッセージです。第三者が解読することはできません。",
+    "Verified!": "検証されました!",
+    "The other party cancelled the verification.": "相手方が確認をキャンセルしました。",
+    "Incoming call": "着信",
+    "Incoming video call": "ビデオ通話の着信",
+    "Incoming voice call": "音声通話の着信",
+    "Unknown caller": "不明な発信者",
+    "Dial pad": "ダイヤルパッド",
+    "There was an error looking up the phone number": "電話番号を見つける際にエラーがありました",
+    "Unable to look up phone number": "電話番号が見つかりません",
+    "%(name)s on hold": "%(name)s が保留中",
+    "Return to call": "電話に戻る",
+    "Fill Screen": "全画面",
+    "Voice Call": "音声電話",
+    "Video Call": "ビデオ通話",
+    "%(peerName)s held the call": "%(peerName)s が電話をかけました",
+    "You held the call <a>Resume</a>": "<a>再開</a>の電話をかけました",
+    "You held the call <a>Switch</a>": "<a>スイッチ</a>に電話をかけました",
+    "sends snowfall": "降雪を送る",
+    "Sends the given message with snowfall": "メッセージを降雪と共に送る",
+    "sends fireworks": "花火を送る",
+    "Sends the given message with fireworks": "メッセージを花火と共に送る",
+    "sends confetti": "紙吹雪を送る",
+    "Sends the given message with confetti": "メッセージを紙吹雪と共に送信します",
+    "This is your list of users/servers you have blocked - don't leave the room!": "あなたがブロックしたユーザー/サーバーのリストです。部屋から出ないでください!",
+    "My Ban List": "私の禁止リスト",
+    "Downloading logs": "ログのダウンロード",
+    "Uploading logs": "ログのアップロード",
+    "Show chat effects (animations when receiving e.g. confetti)": "チャット効果を表示する(紙吹雪などを受け取ったときのアニメーション)",
+    "IRC display name width": "IRC表示名の幅",
+    "How fast should messages be downloaded.": "メッセージをダウンロードする速度。",
+    "Enable message search in encrypted rooms": "暗号化された部屋でもメッセージ検索を有効にする",
+    "Show hidden events in timeline": "省略されたイベントをタイムラインに表示する",
+    "Use Command + Enter to send a message": "メッセージ送信に Command + Enter を使う",
+    "Use Command + F to search": "検索に Command + F を使う",
+    "Show line numbers in code blocks": "コードブロックに行番号を表示する",
+    "Expand code blocks by default": "デフォルトでコードブロックを展開表示する",
+    "Show stickers button": "ステッカーボタンを表示する",
+    "Show info about bridges in room settings": "部屋の設定にブリッジの情報を表示する",
+    "Enable advanced debugging for the room list": "ルーム一覧の高度なデバッグを有効にする",
+    "Offline encrypted messaging using dehydrated devices": "dehydrated デバイスを使用したオフライン暗号化メッセージング",
+    "Show message previews for reactions in all rooms": "すべての部屋でリアクションのメッセージプレビューを表示する",
+    "Show message previews for reactions in DMs": "DM中のリアクションにメッセージプレビューを表示する",
+    "Support adding custom themes": "カスタムテーマの追加に対応する",
+    "Try out new ways to ignore people (experimental)": "人々を無視する新しい方法を試す (実験的)",
+    "Multiple integration managers": "複数の integration マネージャー",
+    "Group & filter rooms by custom tags (refresh to apply changes)": "カスタムタグを使って部屋をグループまたはフィルタします(ページのリロードが必要)",
+    "New spinner design": "新しいスピナーのデザイン",
+    "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.": "Communities v2 prototypes. 互換性のあるホームサーバーが必要です。 非常に実験的。注意して使用してください。",
+    "Render LaTeX maths in messages": "メッセージ中の LaTeX 数式を描画する",
+    "Change notification settings": "通知設定を変更する",
+    "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s",
+    "%(senderName)s: %(reaction)s": "%(senderName)s: %(reaction)s",
+    "%(senderName)s: %(message)s": "%(senderName)s: %(message)s",
+    "* %(senderName)s %(emote)s": "* %(senderName)s %(emote)s",
+    "%(senderName)s is calling": "%(senderName)s が呼び出し中",
+    "Waiting for answer": "応答を待っています",
+    "%(senderName)s started a call": "%(senderName)s が通話を開始しました",
+    "You started a call": "あなたは通話を開始しました",
+    "Call ended": "通話が終了しました",
+    "%(senderName)s ended the call": "%(senderName)s が通話を終了しました",
+    "You ended the call": "あなたは通話を終了しました",
+    "Call in progress": "通話中",
+    "%(senderName)s joined the call": "%(senderName)s が通話に参加しました",
+    "You joined the call": "通話に参加しました",
+    "The person who invited you already left the room, or their server is offline.": "あなたを招待した人はすでに部屋を出たか、彼らのサーバーがオフライン状態です。",
+    "The person who invited you already left the room.": "あなたを招待した人はすでに部屋を出ました。",
+    "There was an error joining the room": "部屋に参加する際にエラーがありました",
+    "Guest": "ゲスト",
+    "Verify the new login accessing your account: %(name)s": "あなたのアカウントへの新しいログインを確認します: %(name)s",
+    "New login. Was this you?": "新しいログインがありました。これはあなたですか?",
+    "Safeguard against losing access to encrypted messages & data": "暗号化されたメッセージとデータへのアクセスを失うことから保護します",
+    "Ok": "OK",
+    "Contact your <a>server admin</a>.": "<a>サーバ管理者</a>に問い合わせてください。",
+    "Your homeserver has exceeded one of its resource limits.": "ホームサーバーはリソースの上限に達しました。",
+    "Your homeserver has exceeded its user limit.": "あなたのホームサーバーはユーザー数の上限に達しました。",
+    "Use app": "アプリを使う",
+    "Element Web is experimental on mobile. For a better experience and the latest features, use our free native app.": "Element Webはモバイル端末ではまだ試験的です。より良い体験と最新の機能を得るには、無料のネイティブアプリを使用してください。",
+    "Use app for a better experience": "より良い体験のためにアプリを使用する",
+    "Enable": "有効",
+    "Enable desktop notifications": "デスクトップ通知を有効にする",
+    "Don't miss a reply": "返信をお見逃しなく",
+    "Verify all your sessions to ensure your account & messages are safe": "すべてのセッションを確認して、アカウントとメッセージが安全であることを確認します",
+    "Review where you’re logged in": "どこからログインしたか確認する",
+    "No": "いいえ",
+    "Yes": "はい",
+    "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "%(brand)s の向上に役立つ <UsageDataLink>匿名の使用状況データ</UsageDataLink> を送信します。 これは <PolicyLink>cookie</PolicyLink> を使用します。",
+    "Help us improve %(brand)s": "%(brand)s の改善にご協力ください",
+    "Short keyboard patterns are easy to guess": "短いキーボードパターンは簡単に推測されます",
+    "Straight rows of keys are easy to guess": "キーの配置順序を辿ると簡単に推測されます",
+    "Common names and surnames are easy to guess": "名前と名字は簡単に推測されます",
+    "Names and surnames by themselves are easy to guess": "名前や名字は簡単に推測されます",
+    "Call failed because webcam or microphone could not be accessed. Check that:": "Webカメラやマイクを利用できず通話に失敗しました。確認してください:",
+    "Unable to access webcam / microphone": "Webカメラとマイクを利用できません",
+    "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "マイクを利用できなかったので通話に失敗しました。マイクが接続されて正しく設定されているか確認してください。",
+    "Unable to access microphone": "マイクを利用できません",
+    "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アドレスが漏洩します。これはアプリ設定でも変更できます。",
+    "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サーバーの設定を尋ねてください。",
+    "The call was answered on another device.": "通話は他の端末で応答されました。",
+    "Answered Elsewhere": "他端末で応答しました",
+    "The call could not be established": "通話を確立できませんでした",
+    "The other party declined the call.": "相手方は通話を拒否しました。",
+    "Call Declined": "通話は拒否されました",
+    "Whether you're using %(brand)s as an installed Progressive Web App": "インストールされた Progressive Web App として %(brand)s を使用しているか",
+    "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "主な入力方法がタッチであるデバイスで %(brand)s を使っているか",
+    "Click the button below to confirm adding this phone number.": "下のボタンをクリックして電話番号の追加を確認します。",
+    "Confirm adding phone number": "電話番号の追加を確認する",
+    "Confirm adding this phone number by using Single Sign On to prove your identity.": "シングルサインオンを使用して本人確認を行い、電話番号の追加を承認してください。",
+    "Click the button below to confirm adding this email address.": "下のボタンを押してこのメールアドレスを確認します。"
 }

From bfa47ba447c3fc5800b6e78349d57d3a9c305003 Mon Sep 17 00:00:00 2001
From: Thibault Martin <mail@thibaultmart.in>
Date: Tue, 9 Mar 2021 12:24:53 +0000
Subject: [PATCH 248/420] Translated using Weblate (French)

Currently translated at 100.0% (2780 of 2780 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fr/
---
 src/i18n/strings/fr.json | 898 +++++++++++++++++++--------------------
 1 file changed, 449 insertions(+), 449 deletions(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index e170ec1414..dc6a70bc24 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -7,10 +7,10 @@
     "Error": "Erreur",
     "Existing Call": "Appel en cours",
     "Export E2E room keys": "Exporter les clés de chiffrement de salon",
-    "Failed to ban user": "Échec du bannissement de l'utilisateur",
-    "Failed to change password. Is your password correct?": "Échec du changement de mot de passe. Votre mot de passe est-il correct ?",
+    "Failed to ban user": "Échec du bannissement de l’utilisateur",
+    "Failed to change password. Is your password correct?": "Échec du changement de mot de passe. Votre mot de passe est-il correct ?",
     "Failed to change power level": "Échec du changement de rang",
-    "Failed to forget room %(errCode)s": "Échec de l'oubli du salon %(errCode)s",
+    "Failed to forget room %(errCode)s": "Échec de l’oubli du salon %(errCode)s",
     "Remove": "Supprimer",
     "Favourite": "Favoris",
     "Notifications": "Notifications",
@@ -20,13 +20,13 @@
     "Admin": "Administrateur",
     "Advanced": "Avancé",
     "%(items)s and %(lastItem)s": "%(items)s et %(lastItem)s",
-    "and %(count)s others...|other": "et %(count)s autres...",
-    "and %(count)s others...|one": "et un autre...",
+    "and %(count)s others...|other": "et %(count)s autres…",
+    "and %(count)s others...|one": "et un autre…",
     "A new password must be entered.": "Un nouveau mot de passe doit être saisi.",
     "Anyone who knows the room's link, apart from guests": "Tous ceux qui connaissent le lien du salon, à part les visiteurs",
     "Anyone who knows the room's link, including guests": "Tous ceux qui connaissent le lien du salon, y compris les visiteurs",
-    "Are you sure?": "Êtes-vous sûr(e) ?",
-    "Are you sure you want to reject the invitation?": "Voulez-vous vraiment rejeter l'invitation ?",
+    "Are you sure?": "Êtes-vous sûr ?",
+    "Are you sure you want to reject the invitation?": "Voulez-vous vraiment rejeter l’invitation ?",
     "Attachment": "Pièce jointe",
     "Autoplay GIFs and videos": "Jouer automatiquement les GIFs et les vidéos",
     "%(senderName)s banned %(targetName)s.": "%(senderName)s a banni %(targetName)s.",
@@ -34,13 +34,13 @@
     "Banned users": "Utilisateurs bannis",
     "Bans user with given id": "Bannit l’utilisateur à partir de son identifiant",
     "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>.",
+    "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 la prise en charge 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.",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s a changé le rang de %(powerLevelDiffText)s.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s a changé le nom du salon en %(roomName)s.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s a changé le sujet du salon en « %(topic)s ».",
-    "Changes your display nickname": "Change votre nom affiché",
+    "Changes your display nickname": "Change votre nom d’affichage",
     "Click here to fix": "Cliquer ici pour réparer",
     "Click to mute audio": "Cliquer pour couper le son",
     "Click to mute video": "Cliquer ici pour couper la vidéo",
@@ -59,24 +59,24 @@
     "Decrypt %(text)s": "Déchiffrer %(text)s",
     "Deops user with given id": "Retire le rang d’opérateur d’un utilisateur à partir de son identifiant",
     "Failed to join room": "Échec de l’inscription au salon",
-    "Failed to kick": "Échec de l'expulsion",
+    "Failed to kick": "Échec de l’expulsion",
     "Failed to leave room": "Échec du départ du salon",
-    "Failed to load timeline position": "Échec du chargement de la position dans l'historique",
-    "Failed to mute user": "Échec de la mise en sourdine de l'utilisateur",
-    "Failed to reject invite": "Échec du rejet de l'invitation",
-    "Failed to reject invitation": "Échec du rejet de l'invitation",
+    "Failed to load timeline position": "Échec du chargement de la position dans le fil de discussion",
+    "Failed to mute user": "Échec de la mise en sourdine de l’utilisateur",
+    "Failed to reject invite": "Échec du rejet de l’invitation",
+    "Failed to reject invitation": "Échec du rejet de l’invitation",
     "Failed to send email": "Échec de l’envoi de l’e-mail",
     "Failed to send request.": "Échec de l’envoi de la requête.",
-    "Failed to set display name": "Échec de l'enregistrement du nom affiché",
+    "Failed to set display name": "Échec de l’enregistrement du nom d’affichage",
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s a accepté l’invitation de %(displayName)s.",
-    "Access Token:": "Jeton d’accès :",
-    "Always show message timestamps": "Toujours afficher l'heure des messages",
+    "Access Token:": "Jeton d’accès :",
+    "Always show message timestamps": "Toujours afficher l’heure des messages",
     "Authentication": "Authentification",
     "%(senderName)s answered the call.": "%(senderName)s a répondu à l’appel.",
     "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": "La vérification de l’adresse e-mail a échoué : 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 création du salon",
     "Favourites": "Favoris",
     "Fill screen": "Plein écran",
@@ -86,8 +86,8 @@
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s de %(fromPowerLevel)s à %(toPowerLevel)s",
     "Hangup": "Raccrocher",
     "Historical": "Historique",
-    "Homeserver is": "Le serveur d'accueil est",
-    "Identity Server is": "Le serveur d'identité est",
+    "Homeserver is": "Le serveur d’accueil est",
+    "Identity Server is": "Le serveur d’identité est",
     "I have verified my email address": "J’ai vérifié mon adresse e-mail",
     "Import E2E room keys": "Importer les clés de chiffrement de bout en bout",
     "Incorrect verification code": "Code de vérification incorrect",
@@ -121,7 +121,7 @@
     "New passwords must match each other.": "Les nouveaux mots de passe doivent être identiques.",
     "not specified": "non spécifié",
     "(not supported by this browser)": "(non pris en charge par ce navigateur)",
-    "<not supported>": "<non supporté>",
+    "<not supported>": "<non pris en charge>",
     "No more results": "Fin des résultats",
     "No results": "Pas de résultat",
     "unknown error code": "code d’erreur inconnu",
@@ -135,41 +135,41 @@
     "Default": "Par défaut",
     "Email address": "Adresse e-mail",
     "Error decrypting attachment": "Erreur lors du déchiffrement de la pièce jointe",
-    "Guests cannot join this room even if explicitly invited.": "Les visiteurs ne peuvent pas rejoindre ce salon, même s'ils ont été explicitement invités.",
+    "Guests cannot join this room even if explicitly invited.": "Les visiteurs ne peuvent pas rejoindre ce salon, même s’ils ont été explicitement invités.",
     "Invalid file%(extra)s": "Fichier %(extra)s non valide",
     "Mute": "Mettre en sourdine",
     "No users have specific privileges in this room": "Aucun utilisateur n’a de privilège spécifique dans ce salon",
-    "olm version:": "version de olm :",
-    "Please check your email and click on the link it contains. Once this is done, click continue.": "Veuillez vérifier vos e-mails et cliquer sur le lien que vous avez reçu. Puis cliquez sur continuer.",
+    "olm version:": "version de olm :",
+    "Please check your email and click on the link it contains. Once this is done, click continue.": "Veuillez consulter vos e-mails et cliquer sur le lien que vous avez reçu. Puis cliquez sur continuer.",
     "Power level must be positive integer.": "Le rang doit être un entier positif.",
     "Privileged Users": "Utilisateurs privilégiés",
     "Profile": "Profil",
     "Reason": "Raison",
     "%(targetName)s rejected the invitation.": "%(targetName)s a rejeté l’invitation.",
-    "Reject invitation": "Rejeter l'invitation",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s a supprimé son nom affiché (%(oldDisplayName)s).",
+    "Reject invitation": "Rejeter l’invitation",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s a supprimé son nom d’affichage (%(oldDisplayName)s).",
     "%(senderName)s removed their profile picture.": "%(senderName)s a supprimé son image de profil.",
     "%(senderName)s requested a VoIP conference.": "%(senderName)s a demandé une téléconférence audio.",
     "Return to login screen": "Retourner à l’écran de connexion",
     "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s n’a pas l’autorisation de vous envoyer des notifications - merci de vérifier les paramètres de votre navigateur",
     "%(brand)s was not given permission to send notifications - please try again": "%(brand)s n’a pas reçu l’autorisation de vous envoyer des notifications - veuillez réessayer",
-    "%(brand)s version:": "Version de %(brand)s :",
+    "%(brand)s version:": "Version de %(brand)s :",
     "Room %(roomId)s not visible": "Le salon %(roomId)s n’est pas visible",
     "Room Colour": "Couleur du salon",
     "Rooms": "Salons",
     "Search": "Rechercher",
     "Search failed": "Échec de la recherche",
     "Searches DuckDuckGo for results": "Recherche des résultats dans DuckDuckGo",
-    "Send Reset Email": "Envoyer l'e-mail de réinitialisation",
+    "Send Reset Email": "Envoyer l’e-mail de réinitialisation",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s a envoyé une image.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s a invité %(targetDisplayName)s à rejoindre le salon.",
     "Server error": "Erreur du serveur",
     "Server may be unavailable, overloaded, or search timed out :(": "Le serveur semble être inaccessible, surchargé ou la recherche a expiré :(",
     "Server may be unavailable, overloaded, or you hit a bug.": "Le serveur semble être indisponible, surchargé ou vous êtes tombé sur un bug.",
-    "Server unavailable, overloaded, or something else went wrong.": "Le serveur semble être inaccessible, surchargé ou quelque chose s'est mal passé.",
+    "Server unavailable, overloaded, or something else went wrong.": "Le serveur semble être inaccessible, surchargé ou quelque chose s’est mal passé.",
     "Session ID": "Identifiant de session",
     "%(senderName)s set a profile picture.": "%(senderName)s a défini une image de profil.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s a défini son nom affiché comme %(displayName)s.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s a défini son nom d’affichage comme %(displayName)s.",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Afficher l’heure au format am/pm (par ex. 2:30pm)",
     "Signed Out": "Déconnecté",
     "Sign in": "Se connecter",
@@ -182,15 +182,15 @@
     "This email address was not found": "Cette adresse e-mail n’a pas été trouvée",
     "The email address linked to your account must be entered.": "L’adresse e-mail liée à votre compte doit être renseignée.",
     "The remote side failed to pick up": "Le correspondant n’a pas décroché",
-    "This room has no local addresses": "Ce salon n'a pas d'adresse locale",
+    "This room has no local addresses": "Ce salon n’a pas d’adresse locale",
     "This room is not recognised.": "Ce salon n’est pas reconnu.",
     "This doesn't appear to be a valid email address": "Cette adresse e-mail ne semble pas valide",
     "This phone number is already in use": "Ce numéro de téléphone est déjà utilisé",
     "This room is not accessible by remote Matrix servers": "Ce salon n’est pas accessible par les serveurs Matrix distants",
     "To use it, just wait for autocomplete results to load and tab through them.": "Pour l’utiliser, attendez simplement que les résultats de l’auto-complétion s’affichent et défilez avec la touche Tab.",
-    "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Un instant donné de la chronologie n’a pu être chargé car vous n’avez pas la permission de le visualiser.",
-    "Tried to load a specific point in this room's timeline, but was unable to find it.": "Un instant donné de la chronologie n’a pu être chargé car il n’a pas pu être trouvé.",
-    "Unable to add email address": "Impossible d'ajouter l'adresse e-mail",
+    "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Un instant donné du fil de discussion n’a pu être chargé car vous n’avez pas la permission de le visualiser.",
+    "Tried to load a specific point in this room's timeline, but was unable to find it.": "Un instant donné du fil de discussion n’a pu être chargé car il n’a pas pu être trouvé.",
+    "Unable to add email address": "Impossible d'ajouter l’adresse e-mail",
     "Unable to remove contact information": "Impossible de supprimer les informations du contact",
     "Unable to verify email address.": "Impossible de vérifier l’adresse e-mail.",
     "Unban": "Révoquer le bannissement",
@@ -198,31 +198,31 @@
     "Unable to capture screen": "Impossible de faire une capture d’écran",
     "Unable to enable Notifications": "Impossible d’activer les notifications",
     "Unmute": "Activer le son",
-    "Upload avatar": "Télécharger une photo de profil",
+    "Upload avatar": "Envoyer un avatar",
     "Upload Failed": "Échec de l’envoi",
     "Upload file": "Envoyer un fichier",
     "Usage": "Utilisation",
     "Users": "Utilisateurs",
     "Verification Pending": "Vérification en attente",
     "Video call": "Appel vidéo",
-    "Voice call": "Appel vocal",
+    "Voice call": "Appel audio",
     "VoIP conference finished.": "Téléconférence VoIP terminée.",
     "VoIP conference started.": "Téléconférence VoIP démarrée.",
     "VoIP is unsupported": "Voix sur IP non prise en charge",
-    "Warning!": "Attention !",
-    "Who can access this room?": "Qui peut accéder au salon ?",
-    "Who can read history?": "Qui peut lire l'historique ?",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s a annulé l’invitation de %(targetName)s.",
+    "Warning!": "Attention !",
+    "Who can access this room?": "Qui peut accéder au salon ?",
+    "Who can read history?": "Qui peut lire l’historique ?",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s a révoqué l’invitation de %(targetName)s.",
     "You are already in a call.": "Vous avez déjà un appel en cours.",
     "You cannot place a call with yourself.": "Vous ne pouvez pas passer d’appel avec vous-même.",
-    "You cannot place VoIP calls in this browser.": "Vous ne pouvez pas passer d’appel en Voix sur IP dans ce navigateur.",
+    "You cannot place VoIP calls in this browser.": "Vous ne pouvez pas passer d’appel en VoIP dans ce navigateur.",
     "You do not have permission to post to this room": "Vous n’avez pas la permission de poster dans ce salon",
     "You have no visible notifications": "Vous n'avez pas de notification visible",
     "You need to be able to invite users to do that.": "Vous devez avoir l’autorisation d’inviter des utilisateurs pour faire ceci.",
     "You need to be logged in.": "Vous devez être identifié.",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Votre adresse e-mail ne semble pas être associée à un identifiant Matrix sur ce serveur d’accueil.",
-    "You seem to be in a call, are you sure you want to quit?": "Vous semblez avoir un appel en cours, voulez-vous vraiment partir ?",
-    "You seem to be uploading files, are you sure you want to quit?": "Vous semblez être en train d'envoyer des fichiers, voulez-vous vraiment partir ?",
+    "You seem to be in a call, are you sure you want to quit?": "Vous semblez avoir un appel en cours, voulez-vous vraiment partir ?",
+    "You seem to be uploading files, are you sure you want to quit?": "Vous semblez être en train d’envoyer des fichiers, voulez-vous vraiment partir ?",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Vous ne pourrez pas annuler cette modification car vous promouvez l’utilisateur au même rang que le vôtre.",
     "Sun": "Dim",
     "Mon": "Lun",
@@ -252,7 +252,7 @@
     "An error occurred: %(error_string)s": "Une erreur est survenue : %(error_string)s",
     "There are no visible files in this room": "Il n'y a pas de fichier visible dans ce salon",
     "Room": "Salon",
-    "Connectivity to the server has been lost.": "La connectivité au serveur a été perdue.",
+    "Connectivity to the server has been lost.": "La connexion au serveur a été perdue.",
     "Sent messages will be stored until your connection has returned.": "Les messages envoyés seront stockés jusqu’à ce que votre connexion revienne.",
     "Cancel": "Annuler",
     "Active call": "Appel en cours",
@@ -260,7 +260,7 @@
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s a supprimé le nom du salon.",
     "Analytics": "Collecte de données",
     "%(brand)s collects anonymous analytics to allow us to improve the application.": "%(brand)s collecte des données anonymes qui nous permettent d’améliorer l’application.",
-    "Passphrases must match": "Les phrases de passe doivent être identiques",
+    "Passphrases must match": "Les phrases secrètes doivent être identiques",
     "Passphrase must not be empty": "Le mot de passe ne peut pas être vide",
     "Export room keys": "Exporter les clés de salon",
     "Enter passphrase": "Saisir le mot de passe",
@@ -276,7 +276,7 @@
     "Failed to invite": "Échec de l’invitation",
     "Failed to invite the following users to the %(roomName)s room:": "Échec de l’invitation des utilisateurs suivants dans le salon %(roomName)s :",
     "Confirm Removal": "Confirmer la suppression",
-    "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.": "Voulez-vous vraiment supprimer cet événement ? Notez que si vous supprimez le changement du nom ou du sujet d’un salon, il est possible que ce changement soit annulé.",
+    "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.": "Voulez-vous vraiment supprimer cet événement ? Notez que si vous supprimez le changement du nom ou du sujet d’un salon, il est possible que ce changement soit annulé.",
     "Unknown error": "Erreur inconnue",
     "Incorrect password": "Mot de passe incorrect",
     "Unable to restore session": "Impossible de restaurer la session",
@@ -288,7 +288,7 @@
     "Dismiss": "Ignorer",
     "Please check your email to continue registration.": "Merci de vérifier votre e-mail afin de continuer votre inscription.",
     "Token incorrect": "Jeton incorrect",
-    "Please enter the code it contains:": "Merci de saisir le code qu'il contient :",
+    "Please enter the code it contains:": "Merci de saisir le code qu’il contient :",
     "powered by Matrix": "propulsé par Matrix",
     "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Si vous ne renseignez pas d’adresse e-mail, vous ne pourrez pas réinitialiser votre mot de passe. En êtes vous sûr(e) ?",
     "Error decrypting audio": "Erreur lors du déchiffrement de l’audio",
@@ -296,7 +296,7 @@
     "Error decrypting video": "Erreur lors du déchiffrement de la vidéo",
     "Add an Integration": "Ajouter une intégration",
     "URL Previews": "Aperçus des liens",
-    "Drop file here to upload": "Déposer le fichier ici pour l'envoyer",
+    "Drop file here to upload": "Glisser le fichier ici pour l’envoyer",
     " (unsupported)": " (pas pris en charge)",
     "Ongoing conference call%(supportedText)s.": "Téléconférence en cours%(supportedText)s.",
     "Online": "En ligne",
@@ -305,7 +305,7 @@
     "Idle": "Inactif",
     "Jump to first unread message.": "Aller au premier message non lu.",
     "Options": "Options",
-    "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?": "Vous êtes sur le point d’accéder à un site tiers afin de pouvoir vous identifier pour utiliser %(integrationsUrl)s. Voulez-vous continuer ?",
+    "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?": "Vous êtes sur le point d’accéder à un site tiers afin de pouvoir vous identifier pour utiliser %(integrationsUrl)s. Voulez-vous continuer ?",
     "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s a changé l’avatar du salon en <img/>",
     "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s a supprimé l'avatar du salon.",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s a changé l’avatar de %(roomName)s",
@@ -315,17 +315,17 @@
     "Results from DuckDuckGo": "Résultats de DuckDuckGo",
     "Verified key": "Clé vérifiée",
     "No Microphones detected": "Aucun micro détecté",
-    "No Webcams detected": "Aucune webcam détectée",
+    "No Webcams detected": "Aucune caméra détectée",
     "No media permissions": "Pas de permission pour les médias",
-    "You may need to manually permit %(brand)s to access your microphone/webcam": "Il est possible que vous deviez manuellement autoriser %(brand)s à accéder à votre micro/webcam",
+    "You may need to manually permit %(brand)s to access your microphone/webcam": "Il est possible que vous deviez manuellement autoriser %(brand)s à accéder à votre micro/caméra",
     "Default Device": "Appareil par défaut",
     "Microphone": "Micro",
     "Camera": "Caméra",
     "Add a topic": "Ajouter un sujet",
-    "Anyone": "N'importe qui",
-    "Are you sure you want to leave the room '%(roomName)s'?": "Voulez-vous vraiment quitter le salon \"%(roomName)s\" ?",
+    "Anyone": "N’importe qui",
+    "Are you sure you want to leave the room '%(roomName)s'?": "Voulez-vous vraiment quitter le salon « %(roomName)s » ?",
     "Custom level": "Rang personnalisé",
-    "Register": "S'inscrire",
+    "Register": "S’inscrire",
     "Save": "Enregistrer",
     "You have <a>disabled</a> URL previews by default.": "Vous avez <a>désactivé</a> les aperçus d’URL par défaut.",
     "You have <a>enabled</a> URL previews by default.": "Vous avez <a>activé</a> les aperçus d’URL par défaut.",
@@ -339,11 +339,11 @@
     "You must <a>register</a> to use this functionality": "Vous devez vous <a>inscrire</a> pour utiliser cette fonctionnalité",
     "Create new room": "Créer un nouveau salon",
     "Room directory": "Répertoire des salons",
-    "Start chat": "Commencer une discussion",
+    "Start chat": "Commencer un conversation privée",
     "New Password": "Nouveau mot de passe",
     "Username available": "Nom d'utilisateur disponible",
     "Username not available": "Nom d'utilisateur indisponible",
-    "Something went wrong!": "Quelque chose s’est mal passé !",
+    "Something went wrong!": "Quelque chose s’est mal déroulé !",
     "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Cela sera le nom de votre compte sur le serveur d'accueil  <span></span>, ou vous pouvez sélectionner un <a>autre serveur</a>.",
     "If you already have a Matrix account you can <a>log in</a> instead.": "Si vous avez déjà un compte Matrix vous pouvez vous <a>connecter</a> à la place.",
     "Accept": "Accepter",
@@ -352,18 +352,18 @@
     "Close": "Fermer",
     "Custom": "Personnaliser",
     "Decline": "Refuser",
-    "Drop File Here": "Déposer le fichier Ici",
-    "Failed to upload profile picture!": "Échec de l'envoi de l'image de profil !",
+    "Drop File Here": "Glisser le fichier ici",
+    "Failed to upload profile picture!": "Échec de l’envoi de l’image de profil !",
     "Incoming call from %(name)s": "Appel entrant de %(name)s",
     "Incoming video call from %(name)s": "Appel vidéo entrant de %(name)s",
     "Incoming voice call from %(name)s": "Appel vocal entrant de %(name)s",
-    "No display name": "Pas de nom affiché",
+    "No display name": "Pas de nom d’affichage",
     "Private Chat": "Discussion privée",
     "Public Chat": "Discussion publique",
-    "%(roomName)s does not exist.": "%(roomName)s n'existe pas.",
-    "%(roomName)s is not accessible at this time.": "%(roomName)s n'est pas accessible pour le moment.",
+    "%(roomName)s does not exist.": "%(roomName)s n’existe pas.",
+    "%(roomName)s is not accessible at this time.": "%(roomName)s n’est pas joignable pour le moment.",
     "Seen by %(userName)s at %(dateTime)s": "Vu par %(userName)s à %(dateTime)s",
-    "Start authentication": "Commencer une authentification",
+    "Start authentication": "Commencer l’authentification",
     "This room": "Ce salon",
     "unknown caller": "appelant inconnu",
     "Unnamed Room": "Salon anonyme",
@@ -371,17 +371,17 @@
     "(~%(count)s results)|one": "(~%(count)s résultat)",
     "(~%(count)s results)|other": "(~%(count)s résultats)",
     "Home": "Accueil",
-    "Upload new:": "Envoyer un nouveau :",
+    "Upload new:": "Envoyer un nouveau :",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Rejoindre en <voiceText>audio</voiceText> ou en <videoText>vidéo</videoText>.",
     "Last seen": "Vu pour la dernière fois",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (rang %(powerLevelNumber)s)",
     "(could not connect media)": "(impossible de se connecter au média)",
     "(no answer)": "(pas de réponse)",
     "(unknown failure: %(reason)s)": "(erreur inconnue : %(reason)s)",
-    "Your browser does not support the required cryptography extensions": "Votre navigateur ne supporte pas les extensions cryptographiques nécessaires",
+    "Your browser does not support the required cryptography extensions": "Votre navigateur ne prend pas en charge les extensions cryptographiques nécessaires",
     "Not a valid %(brand)s keyfile": "Fichier de clé %(brand)s non valide",
-    "Authentication check failed: incorrect password?": "Erreur d’authentification : mot de passe incorrect ?",
-    "Do you want to set an email address?": "Souhaitez-vous configurer une adresse e-mail ?",
+    "Authentication check failed: incorrect password?": "Erreur d’authentification : mot de passe incorrect ?",
+    "Do you want to set an email address?": "Souhaitez-vous configurer une adresse e-mail ?",
     "This will allow you to reset your password and receive notifications.": "Ceci vous permettra de réinitialiser votre mot de passe et de recevoir des notifications.",
     "Skip": "Passer",
     "Check for update": "Rechercher une mise à jour",
@@ -397,13 +397,13 @@
     "You do not have permission to do that in this room.": "Vous n’avez pas l’autorisation d’effectuer cette action dans ce salon.",
     "Example": "Exemple",
     "Create": "Créer",
-    "Featured Rooms:": "Salons mis en avant :",
-    "Featured Users:": "Utilisateurs mis en avant :",
+    "Featured Rooms:": "Salons mis en avant :",
+    "Featured Users:": "Utilisateurs mis en avant :",
     "Automatically replace plain text Emoji": "Remplacer automatiquement le texte par des émojis",
-    "Failed to upload image": "Impossible d'envoyer l'image",
+    "Failed to upload image": "Impossible d’envoyer l’image",
     "%(widgetName)s widget added by %(senderName)s": "Widget %(widgetName)s ajouté par %(senderName)s",
     "%(widgetName)s widget removed by %(senderName)s": "Widget %(widgetName)s supprimé par %(senderName)s",
-    "Publish this room to the public in %(domain)s's room directory?": "Publier ce salon dans le répertoire de salons public de %(domain)s ?",
+    "Publish this room to the public in %(domain)s's room directory?": "Publier ce salon dans le répertoire de salons public de %(domain)s ?",
     "Cannot add any more widgets": "Impossible d'ajouter plus de widgets",
     "The maximum permitted number of widgets have already been added to this room.": "Le nombre maximum de widgets autorisés a déjà été atteint pour ce salon.",
     "AM": "AM",
@@ -432,26 +432,26 @@
     "Unignore": "Ne plus ignorer",
     "Ignore": "Ignorer",
     "Invite": "Inviter",
-    "Admin Tools": "Outils d'administration",
+    "Admin Tools": "Outils d’administration",
     "Unpin Message": "Dépingler le message",
     "Jump to message": "Aller au message",
     "No pinned messages.": "Aucun message épinglé.",
-    "Loading...": "Chargement...",
+    "Loading...": "Chargement…",
     "Pinned Messages": "Messages épinglés",
     "Unknown": "Inconnu",
     "Unnamed room": "Salon sans nom",
     "No rooms to show": "Aucun salon à afficher",
     "Banned by %(displayName)s": "Banni par %(displayName)s",
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s a changé les messages épinglés du salon.",
-    "Jump to read receipt": "Aller à l'accusé de lecture",
+    "Jump to read receipt": "Aller à l’accusé de lecture",
     "World readable": "Lisible publiquement",
     "Guests can join": "Accessible aux visiteurs",
     "Invalid community ID": "Identifiant de communauté non valide",
-    "'%(groupId)s' is not a valid community ID": "\"%(groupId)s\" n'est pas un identifiant de communauté valide",
+    "'%(groupId)s' is not a valid community ID": "« %(groupId)s » n’est pas un identifiant de communauté valide",
     "%(senderName)s sent an image": "%(senderName)s a envoyé une image",
     "%(senderName)s sent a video": "%(senderName)s a envoyé une vidéo",
     "%(senderName)s uploaded a file": "%(senderName)s a transféré un fichier",
-    "Disinvite this user?": "Désinviter l'utilisateur ?",
+    "Disinvite this user?": "Désinviter l’utilisateur ?",
     "Kick this user?": "Expulser cet utilisateur ?",
     "Unban this user?": "Révoquer le bannissement de cet utilisateur ?",
     "Ban this user?": "Bannir cet utilisateur ?",
@@ -464,13 +464,13 @@
     "Remove from community": "Supprimer de la communauté",
     "Disinvite this user from community?": "Désinviter cet utilisateur de la communauté ?",
     "Remove this user from community?": "Supprimer cet utilisateur de la communauté ?",
-    "Failed to withdraw invitation": "Échec de l'annulation de l'invitation",
-    "Failed to remove user from community": "Échec de la suppression de l'utilisateur de la communauté",
+    "Failed to withdraw invitation": "Échec de l’annulation de l’invitation",
+    "Failed to remove user from community": "Échec de la suppression de l’utilisateur de la communauté",
     "Filter community members": "Filtrer les membres de la communauté",
     "Filter community rooms": "Filtrer les salons de la communauté",
     "Failed to remove room from community": "Échec de la suppression du salon de la communauté",
-    "Failed to remove '%(roomName)s' from %(groupId)s": "Échec de la suppression de \"%(roomName)s\" de %(groupId)s",
-    "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "Voulez-vous vraiment supprimer \"%(roomName)s\" de %(groupId)s ?",
+    "Failed to remove '%(roomName)s' from %(groupId)s": "Échec de la suppression de « %(roomName)s » de %(groupId)s",
+    "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "Voulez-vous vraiment supprimer « %(roomName)s » de %(groupId)s ?",
     "Removing a room from the community will also remove it from the community page.": "Supprimer un salon de la communauté le supprimera aussi de la page de la communauté.",
     "Delete Widget": "Supprimer le widget",
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Supprimer un widget le supprime pour tous les utilisateurs du salon. Voulez-vous vraiment supprimer ce widget ?",
@@ -525,13 +525,13 @@
     "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)s a changé d'avatar",
     "%(items)s and %(count)s others|other": "%(items)s et %(count)s autres",
     "%(items)s and %(count)s others|one": "%(items)s et un autre",
-    "And %(count)s more...|other": "Et %(count)s autres...",
+    "And %(count)s more...|other": "Et %(count)s autres…",
     "Matrix ID": "Identifiant Matrix",
     "Matrix Room ID": "Identifiant de salon Matrix",
     "email address": "adresse e-mail",
-    "Try using one of the following valid address types: %(validTypesList)s.": "Essayez d'utiliser un des types d'adresse valide suivants : %(validTypesList)s.",
-    "You have entered an invalid address.": "L'adresse saisie n'est pas valide.",
-    "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Les identifiants de communauté ne peuvent contenir que les caractères a-z, 0-9 ou '=_-./'",
+    "Try using one of the following valid address types: %(validTypesList)s.": "Essayez d’utiliser un des types d’adresse valide suivants : %(validTypesList)s.",
+    "You have entered an invalid address.": "L’adresse saisie n’est pas valide.",
+    "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Les identifiants de communauté ne peuvent contenir que les caractères a-z, 0-9 ou « =_-./ »",
     "Something went wrong whilst creating your community": "Une erreur est survenue lors de la création de votre communauté",
     "Create Community": "Créer une communauté",
     "Community Name": "Nom de la communauté",
@@ -540,41 +540,41 @@
     "Add rooms to the community summary": "Ajouter des salons au sommaire de la communauté",
     "Which rooms would you like to add to this summary?": "Quels salons souhaitez-vous ajouter à ce sommaire ?",
     "Add to summary": "Ajouter au sommaire",
-    "Failed to add the following rooms to the summary of %(groupId)s:": "Échec de l'ajout des salons suivants au sommaire de %(groupId)s :",
+    "Failed to add the following rooms to the summary of %(groupId)s:": "Échec de l’ajout des salons suivants au sommaire de %(groupId)s :",
     "Add a Room": "Ajouter un salon",
     "Failed to remove the room from the summary of %(groupId)s": "Échec de la suppression du salon du sommaire de %(groupId)s",
-    "The room '%(roomName)s' could not be removed from the summary.": "Le salon \"%(roomName)s\" n'a pas pu être supprimé du sommaire.",
+    "The room '%(roomName)s' could not be removed from the summary.": "Le salon « %(roomName)s » n’a pas pu être supprimé du sommaire.",
     "Add users to the community summary": "Ajouter des utilisateurs au sommaire de la communauté",
     "Who would you like to add to this summary?": "Qui souhaitez-vous ajouter à ce sommaire ?",
-    "Failed to add the following users to the summary of %(groupId)s:": "Échec de l'ajout des utilisateurs suivants au sommaire de %(groupId)s :",
+    "Failed to add the following users to the summary of %(groupId)s:": "Échec de l’ajout des utilisateurs suivants au sommaire de %(groupId)s :",
     "Add a User": "Ajouter un utilisateur",
-    "Failed to remove a user from the summary of %(groupId)s": "Échec de la suppression d'un utilisateur du sommaire de %(groupId)s",
-    "The user '%(displayName)s' could not be removed from the summary.": "L'utilisateur \"%(displayName)s\" n'a pas pu être supprimé du sommaire.",
+    "Failed to remove a user from the summary of %(groupId)s": "Échec de la suppression d’un utilisateur du sommaire de %(groupId)s",
+    "The user '%(displayName)s' could not be removed from the summary.": "L'utilisateur « %(displayName)s » n'a pas pu être supprimé du sommaire.",
     "Failed to update community": "Échec de la mise à jour de la communauté",
-    "Unable to accept invite": "Impossible d'accepter l'invitation",
-    "Unable to reject invite": "Impossible de décliner l'invitation",
+    "Unable to accept invite": "Impossible d’accepter l’invitation",
+    "Unable to reject invite": "Impossible de décliner l’invitation",
     "Leave Community": "Quitter la communauté",
     "Leave %(groupName)s?": "Quitter %(groupName)s ?",
     "Leave": "Quitter",
     "Community Settings": "Paramètres de la communauté",
     "Add rooms to this community": "Ajouter des salons à cette communauté",
     "%(inviter)s has invited you to join this community": "%(inviter)s vous a invité à rejoindre cette communauté",
-    "You are an administrator of this community": "Vous êtes un(e) administrateur(trice) de cette communauté",
+    "You are an administrator of this community": "Vous êtes un administrateur de cette communauté",
     "You are a member of this community": "Vous êtes un membre de cette communauté",
     "Long Description (HTML)": "Description longue (HTML)",
     "Description": "Description",
     "Community %(groupId)s not found": "Communauté %(groupId)s non trouvée",
     "Failed to load %(groupId)s": "Échec du chargement de %(groupId)s",
     "Your Communities": "Vos communautés",
-    "You're not currently a member of any communities.": "Vous n'êtes actuellement membre d'aucune communauté.",
-    "Error whilst fetching joined communities": "Erreur lors de l'obtention des communautés rejointes",
+    "You're not currently a member of any communities.": "Vous n’êtes actuellement membre d’aucune communauté.",
+    "Error whilst fetching joined communities": "Erreur lors de la récupération des communautés dont vous faites partie",
     "Create a new community": "Créer une nouvelle communauté",
-    "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Créez une communauté pour grouper des utilisateurs et des salons ! Construisez une page d'accueil personnalisée pour distinguer votre espace dans l'univers Matrix.",
+    "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Créez une communauté pour grouper des utilisateurs et des salons ! Construisez une page d’accueil personnalisée pour distinguer votre espace dans l’univers Matrix.",
     "Mirror local video feed": "Inverser horizontalement la vidéo locale (effet miroir)",
     "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Un e-mail a été envoyé à %(emailAddress)s. Après avoir suivi le lien présent dans celui-ci, cliquez ci-dessous.",
     "Ignores a user, hiding their messages from you": "Ignore un utilisateur, en masquant ses messages",
     "Stops ignoring a user, showing their messages going forward": "Arrête d’ignorer un utilisateur, en affichant ses messages à partir de maintenant",
-    "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "La visibilité de \"%(roomName)s\" dans %(groupId)s n'a pas pu être mise à jour.",
+    "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "La visibilité de « %(roomName)s » dans %(groupId)s n’a pas pu être mise à jour.",
     "Visibility in Room List": "Visibilité dans la liste des salons",
     "Visible to everyone": "Visible pour tout le monde",
     "Only visible to community members": "Visible uniquement par les membres de la communauté",
@@ -583,13 +583,13 @@
     "Room Notification": "Notification du salon",
     "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Ces salons sont affichés aux membres de la communauté sur la page de la communauté. Les membres de la communauté peuvent rejoindre ces salons en cliquant dessus.",
     "<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 pour votre page de communauté</h1>\n<p>\n    Utilisez la description longue pour présenter la communauté aux nouveaux membres\n    ou pour diffuser des <a href=\"foo\">liens</a> importants\n</p>\n<p>\n    Vous pouvez même utiliser des balises \"img\"\n</p>\n",
-    "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!": "Votre communauté n'a pas de description longue, une page HTML à montrer aux membres de la communauté.<br />Cliquez ici pour ouvrir les réglages et créez-la !",
+    "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!": "Votre communauté n’a pas de description longue, une page HTML à montrer aux membres de la communauté.<br />Cliquez ici pour ouvrir les réglages et créez-la !",
     "Show these rooms to non-members on the community page and room list?": "Afficher ces salons aux non-membres sur la page de communauté et la liste des salons ?",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Veuillez noter que vous vous connectez au serveur %(hs)s, pas à matrix.org.",
     "Restricted": "Restreint",
-    "Enable inline URL previews by default": "Activer l'aperçu des URL par défaut",
-    "Enable URL previews for this room (only affects you)": "Activer l'aperçu des URL pour ce salon (n'affecte que vous)",
-    "Enable URL previews by default for participants in this room": "Activer l'aperçu des URL par défaut pour les participants de ce salon",
+    "Enable inline URL previews by default": "Activer l’aperçu des URL par défaut",
+    "Enable URL previews for this room (only affects you)": "Activer l’aperçu des URL pour ce salon (n’affecte que vous)",
+    "Enable URL previews by default for participants in this room": "Activer l’aperçu des URL par défaut pour les participants de ce salon",
     "URL previews are enabled by default for participants in this room.": "Les aperçus d'URL sont activés par défaut pour les participants de ce salon.",
     "URL previews are disabled by default for participants in this room.": "Les aperçus d'URL sont désactivés par défaut pour les participants de ce salon.",
     "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Il n'y a personne d'autre ici ! Souhaitez-vous <inviteText>inviter d'autres personnes</inviteText> ou <nowarnText>ne plus être notifié à propos du salon vide</nowarnText> ?",
@@ -601,22 +601,22 @@
     "Idle for %(duration)s": "Inactif depuis %(duration)s",
     "Offline for %(duration)s": "Hors ligne depuis %(duration)s",
     "Unknown for %(duration)s": "Inconnu depuis %(duration)s",
-    "Something went wrong when trying to get your communities.": "Une erreur est survenue lors de l'obtention de vos communautés.",
-    "This homeserver doesn't offer any login flows which are supported by this client.": "Ce serveur d'accueil n'offre aucune méthode d'identification compatible avec ce client.",
+    "Something went wrong when trying to get your communities.": "Une erreur est survenue lors de la récupération de vos communautés.",
+    "This homeserver doesn't offer any login flows which are supported by this client.": "Ce serveur d’accueil n’offre aucune méthode d’identification compatible avec ce client.",
     "Flair": "Badge",
-    "Showing flair for these communities:": "Ce salon affichera les badges pour ces communautés :",
-    "This room is not showing flair for any communities": "Ce salon n'affiche de badge pour aucune communauté",
+    "Showing flair for these communities:": "Ce salon affichera les badges pour ces communautés :",
+    "This room is not showing flair for any communities": "Ce salon n’affiche de badge pour aucune communauté",
     "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": "L’appel a échoué",
     "Send": "Envoyer",
     "Old cryptography data detected": "Anciennes données de chiffrement détectées",
-    "Data from an older version of %(brand)s 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.": "Nous avons détecté des données d'une ancienne version de %(brand)s. Le chiffrement de bout en bout n'aura pas fonctionné correctement sur l'ancienne version. Les messages chiffrés échangés récemment dans l'ancienne version ne sont peut-être pas déchiffrables dans cette version. Les échanges de message avec cette version peuvent aussi échouer. Si vous rencontrez des problèmes, déconnectez-vous puis reconnectez-vous. Pour conserver l'historique des messages, exportez puis réimportez vos clés de chiffrement.",
+    "Data from an older version of %(brand)s 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.": "Nous avons détecté des données d’une ancienne version de %(brand)s. Le chiffrement de bout en bout n’aura pas fonctionné correctement sur l’ancienne version. Les messages chiffrés échangés récemment dans l’ancienne version ne sont peut-être pas déchiffrables dans cette version. Les échanges de message avec cette version peuvent aussi échouer. Si vous rencontrez des problèmes, déconnectez-vous puis reconnectez-vous. Pour conserver l’historique des messages, exportez puis réimportez vos clés de chiffrement.",
     "Warning": "Attention",
-    "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.": "Vous ne pourrez pas annuler cette modification car vous vous destituez. Si vous êtes le dernier utilisateur privilégié de ce salon, il sera impossible de récupérer les privilèges.",
-    "%(count)s of your messages have not been sent.|one": "Votre message n'a pas été envoyé.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Tout renvoyer</resendText> ou <cancelText>tout annuler</cancelText> maintenant. Vous pouvez aussi choisir des messages individuels à renvoyer ou annuler.",
+    "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.": "Vous ne pourrez pas annuler cette modification car vous vous rétrogradez. Si vous êtes le dernier utilisateur privilégié de ce salon, il sera impossible de récupérer les privilèges.",
+    "%(count)s of your messages have not been sent.|one": "Votre message n’a pas été envoyé.",
+    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Tout renvoyer</resendText> ou <cancelText>tout annuler</cancelText> maintenant. Vous pouvez aussi choisir de ne renvoyer ou annuler que certains messages.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Renvoyer le message</resendText> ou <cancelText>annuler le message</cancelText> maintenant.",
     "Send an encrypted reply…": "Envoyer une réponse chiffrée…",
     "Send an encrypted message…": "Envoyer un message chiffré…",
@@ -633,31 +633,31 @@
     "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",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s %(day)s %(monthName)s %(fullYear)s",
-    "This room is not public. You will not be able to rejoin without an invite.": "Ce salon n'est pas public. Vous ne pourrez pas y revenir sans invitation.",
+    "This room is not public. You will not be able to rejoin without an invite.": "Ce salon n’est pas public. Vous ne pourrez pas y revenir sans invitation.",
     "Community IDs cannot be empty.": "Les identifiants de communauté ne peuvent pas être vides.",
     "<a>In reply to</a> <pill>": "<a>En réponse à</a> <pill>",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s a changé son nom affiché en %(displayName)s.",
-    "Failed to set direct chat tag": "Échec de l'ajout de l'étiquette discussion directe",
-    "Failed to remove tag %(tagName)s from room": "Échec de la suppression de l'étiquette %(tagName)s du salon",
-    "Failed to add tag %(tagName)s to room": "Échec de l'ajout de l'étiquette %(tagName)s au salon",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s a changé son nom d’affichage en %(displayName)s.",
+    "Failed to set direct chat tag": "Échec de l’ajout de l’étiquette discussion directe",
+    "Failed to remove tag %(tagName)s from room": "Échec de la suppression de l’étiquette %(tagName)s du salon",
+    "Failed to add tag %(tagName)s to room": "Échec de l’ajout de l’étiquette %(tagName)s au salon",
     "Clear filter": "Supprimer les filtres",
     "Did you know: you can use communities to filter your %(brand)s experience!": "Le saviez-vous : vous pouvez utiliser les communautés pour filtrer votre expérience %(brand)s !",
-    "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Pour activer un filtre, faites glisser un avatar de communauté sur le panneau des filtres tout à gauche de l'écran. Vous pouvez cliquer sur un avatar dans ce panneau quand vous le souhaitez afin de ne voir que les salons et les personnes associés à cette communauté.",
+    "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Pour activer un filtre, faites glisser un avatar de communauté sur le panneau des filtres tout à gauche de l’écran. Vous pouvez cliquer sur un avatar dans ce panneau quand vous le souhaitez afin de ne voir que les salons et les personnes associés à cette communauté.",
     "Key request sent.": "Demande de clé envoyée.",
     "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Vu par %(displayName)s (%(userName)s) à %(dateTime)s",
     "Code": "Code",
-    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Si vous avez signalé un bug via GitHub, les journaux de débogage peuvent nous aider à identifier le problème. Les journaux de débogage contiennent des données d'utilisation de l'application dont votre nom d'utilisateur, les identifiants ou alias des salons ou groupes que vous avez visité et les noms d'utilisateur des autres participants. Ils ne contiennent pas les messages.",
+    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Si vous avez signalé un bug via GitHub, les journaux de débogage peuvent nous aider à identifier le problème. Les journaux de débogage contiennent des données d’utilisation de l’application dont votre nom d’utilisateur, les identifiants ou alias des salons ou groupes que vous avez visité et les noms d’utilisateur des autres participants. Ils ne contiennent pas les messages.",
     "Submit debug logs": "Envoyer les journaux de débogage",
     "Opens the Developer Tools dialog": "Ouvre la fenêtre des outils de développeur",
     "Unable to join community": "Impossible de rejoindre la communauté",
     "Unable to leave community": "Impossible de quitter la communauté",
-    "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Les changements effectués au <bold1>nom</bold1> et à l'<bold2>avatar</bold2> de votre communauté peuvent prendre jusqu'à 30 minutes avant d'être vus par d'autres utilisateurs.",
+    "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Les changements effectués au <bold1>nom</bold1> et à l’<bold2>avatar</bold2> de votre communauté peuvent prendre jusqu'à 30 minutes avant d’être visibles par d’autres utilisateurs.",
     "Join this community": "Rejoindre cette communauté",
     "Leave this community": "Quitter cette communauté",
-    "Stickerpack": "Pack de stickers",
-    "You don't currently have any stickerpacks enabled": "Vous n'avez activé aucun pack de stickers pour l'instant",
-    "Hide Stickers": "Masquer les stickers",
-    "Show Stickers": "Afficher les stickers",
+    "Stickerpack": "Jeu d’autocollants",
+    "You don't currently have any stickerpacks enabled": "Vous n'avez activé aucun jeu d’autocollants pour l’instant",
+    "Hide Stickers": "Masquer les autocollants",
+    "Show Stickers": "Afficher les autocollants",
     "Who can join this community?": "Qui peut rejoindre cette communauté ?",
     "Everyone": "Tout le monde",
     "Fetching third party location failed": "Échec de la récupération de la localisation tierce",
@@ -666,7 +666,7 @@
     "Uploading report": "Envoi du rapport",
     "Sunday": "Dimanche",
     "Notification targets": "Appareils recevant les notifications",
-    "Today": "Aujourd'hui",
+    "Today": "Aujourd’hui",
     "Files": "Fichiers",
     "You are not receiving desktop notifications": "Vous ne recevez pas les notifications sur votre bureau",
     "Friday": "Vendredi",
@@ -675,25 +675,25 @@
     "On": "Activé",
     "Changelog": "Journal des modifications",
     "Waiting for response from server": "En attente d’une réponse du serveur",
-    "Send Custom Event": "Envoyer l'événement personnalisé",
+    "Send Custom Event": "Envoyer l’événement personnalisé",
     "Advanced notification settings": "Paramètres de notification avancés",
     "Forget": "Oublier",
     "You cannot delete this image. (%(code)s)": "Vous ne pouvez pas supprimer cette image. (%(code)s)",
-    "Cancel Sending": "Annuler l'envoi",
+    "Cancel Sending": "Annuler l’envoi",
     "This Room": "Ce salon",
     "Noisy": "Sonore",
     "Room not found": "Salon non trouvé",
-    "Messages containing my display name": "Messages contenant mon nom affiché",
+    "Messages containing my display name": "Messages contenant mon nom d’affichage",
     "Messages in one-to-one chats": "Messages dans les discussions directes",
     "Unavailable": "Indisponible",
     "View Decrypted Source": "Voir la source déchiffrée",
-    "Failed to update keywords": "Échec dans la mise à jour des mots-clés",
+    "Failed to update keywords": "Échec de la mise à jour des mots-clés",
     "remove %(name)s from the directory.": "supprimer %(name)s du répertoire.",
-    "Notifications on the following keywords follow rules which can’t be displayed here:": "Les notifications pour les mots-clés suivant répondent à des critères qui ne peuvent pas être affichés ici :",
+    "Notifications on the following keywords follow rules which can’t be displayed here:": "Les notifications pour les mots-clés suivant répondent à des critères qui ne peuvent pas être affichés ici :",
     "Please set a password!": "Veuillez définir un mot de passe !",
     "You have successfully set a password!": "Vous avez défini un mot de passe avec succès !",
     "An error occurred whilst saving your email notification preferences.": "Une erreur est survenue lors de la sauvegarde de vos préférences de notification par e-mail.",
-    "Explore Room State": "Parcourir l'état du salon",
+    "Explore Room State": "Parcourir l’état du salon",
     "Source URL": "URL de la source",
     "Messages sent by bot": "Messages envoyés par des robots",
     "Filter results": "Filtrer les résultats",
@@ -707,10 +707,10 @@
     "Messages containing <span>keywords</span>": "Messages contenant des <span>mots-clés</span>",
     "Error saving email notification preferences": "Erreur lors de la sauvegarde des préférences de notification par e-mail",
     "Tuesday": "Mardi",
-    "Enter keywords separated by a comma:": "Entrez les mots-clés séparés par une virgule :",
+    "Enter keywords separated by a comma:": "Entrez les mots-clés séparés par une virgule :",
     "Search…": "Rechercher…",
     "You have successfully set a password and an email address!": "Vous avez défini un mot de passe et une adresse e-mail avec succès !",
-    "Remove %(name)s from the directory?": "Supprimer %(name)s du répertoire ?",
+    "Remove %(name)s from the directory?": "Supprimer %(name)s du répertoire ?",
     "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s utilise de nombreuses fonctionnalités avancées du navigateur, certaines ne sont pas disponibles ou expérimentales dans votre navigateur actuel.",
     "Developer Tools": "Outils de développement",
     "Remember, you can always set an email address in user settings if you change your mind.": "Souvenez-vous que vous pourrez toujours définir une adresse e-mail dans les paramètres de l'utilisateur si vous changez d’avis.",
@@ -727,7 +727,7 @@
     "Enable them now": "Les activer maintenant",
     "Toolbox": "Boîte à outils",
     "Collecting logs": "Récupération des journaux",
-    "You must specify an event type!": "Vous devez spécifier un type d'événement !",
+    "You must specify an event type!": "Vous devez indiquer un type d’événement !",
     "(HTTP status %(httpStatus)s)": "(état HTTP %(httpStatus)s)",
     "Invite to this room": "Inviter dans ce salon",
     "Wednesday": "Mercredi",
@@ -736,15 +736,15 @@
     "Send logs": "Envoyer les journaux",
     "All messages": "Tous les messages",
     "Call invitation": "Appel entrant",
-    "Downloading update...": "Mise à jour en cours de téléchargement...",
-    "State Key": "Clé d'état",
-    "Failed to send custom event.": "Échec de l'envoi de l'événement personnalisé.",
+    "Downloading update...": "Mise à jour en cours de téléchargement…",
+    "State Key": "Clé d’état",
+    "Failed to send custom event.": "Échec de l’envoi de l’événement personnalisé.",
     "What's new?": "Nouveautés",
     "Notify me for anything else": "Me notifier pour tout le reste",
     "View Source": "Voir la source",
-    "Can't update user notification settings": "Impossible de mettre à jour les paramètres de notification de l'utilisateur",
+    "Can't update user notification settings": "Impossible de mettre à jour les paramètres de notification de l’utilisateur",
     "Notify for all other messages/rooms": "Me notifier pour tous les autres messages/salons",
-    "Unable to look up room ID from server": "Impossible de récupérer l'ID du salon sur le serveur",
+    "Unable to look up room ID from server": "Impossible de récupérer l’identifiant du salon sur le serveur",
     "Couldn't find a matching Matrix room": "Impossible de trouver un salon Matrix correspondant",
     "All Rooms": "Tous les salons",
     "Thursday": "Jeudi",
@@ -752,7 +752,7 @@
     "Back": "Retour",
     "Reply": "Répondre",
     "Show message in desktop notification": "Afficher le message dans les notifications de bureau",
-    "Unhide Preview": "Dévoiler l'aperçu",
+    "Unhide Preview": "Dévoiler l’aperçu",
     "Unable to join network": "Impossible de rejoindre le réseau",
     "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Désolé, %(brand)s n'est <b>pas</b> supporté par votre navigateur.",
     "Uploaded on %(date)s by %(user)s": "Téléchargé le %(date)s par %(user)s",
@@ -767,21 +767,21 @@
     "Mentions only": "Seulement les mentions",
     "You can now return to your account after signing out, and sign in on other devices.": "Vous pouvez maintenant revenir sur votre compte après vous être déconnecté, et vous identifier sur d'autres appareils.",
     "Enable email notifications": "Activer les notifications par e-mail",
-    "Event Type": "Type d'événement",
+    "Event Type": "Type d’événement",
     "Download this file": "Télécharger ce fichier",
     "Pin Message": "Épingler le message",
     "Failed to change settings": "Échec de la mise à jour des paramètres",
     "View Community": "Voir la communauté",
     "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!": "Depuis votre navigateur actuel, le visuel et le ressenti de l'application pourraient être complètement erronés, et certaines fonctionnalités pourraient ne pas être supportées. Vous pouvez continuer malgré tout, mais vous n'aurez aucune aide si vous rencontrez des problèmes !",
     "Event sent!": "Événement envoyé !",
-    "Event Content": "Contenu de l'événement",
-    "Thank you!": "Merci !",
+    "Event Content": "Contenu de l’événement",
+    "Thank you!": "Merci !",
     "When I'm invited to a room": "Quand je suis invité dans un salon",
-    "Checking for an update...": "Recherche de mise à jour...",
+    "Checking for an update...": "Recherche de mise à jour…",
     "Logs sent": "Journaux envoyés",
-    "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Les journaux de débogage contiennent des données d'usage de l'application qui incluent votre nom d'utilisateur, les identifiants ou alias des salons ou groupes auxquels vous avez rendu visite ainsi que les noms des autres utilisateurs. Ils ne contiennent aucun message.",
-    "Failed to send logs: ": "Échec lors de l'envoi des journaux : ",
-    "Preparing to send logs": "Préparation d'envoi des journaux",
+    "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.": "Les journaux de débogage contiennent des données d'usage de l’application qui incluent votre nom d’utilisateur, les identifiants ou alias des salons ou groupes auxquels vous avez rendu visite ainsi que les noms des autres utilisateurs. Ils ne contiennent aucun message.",
+    "Failed to send logs: ": "Échec lors de l’envoi des journaux : ",
+    "Preparing to send logs": "Préparation de l’envoi des journaux",
     "Missing roomId.": "Identifiant de salon manquant.",
     "Popout widget": "Détacher le widget",
     "Every page you use in the app": "Toutes les pages que vous utilisez dans l’application",
@@ -792,46 +792,46 @@
     "Clear Storage and Sign Out": "Effacer le stockage et se déconnecter",
     "Refresh": "Rafraîchir",
     "We encountered an error trying to restore your previous session.": "Une erreur est survenue lors de la restauration de la dernière session.",
-    "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Effacer le stockage de votre navigateur peut résoudre le problème, mais cela vous déconnectera et tous les historiques de conversation encryptés seront illisibles.",
-    "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Impossible de charger l'événement auquel il a été répondu, soit il n'existe pas, soit vous n'avez pas l'autorisation de le voir.",
+    "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Effacer le stockage de votre navigateur peut résoudre le problème. Ceci vous déconnectera et tous les historiques de conversations chiffrées seront illisibles.",
+    "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Impossible de charger l’événement auquel il a été répondu, soit il n’existe pas, soit vous n'avez pas l’autorisation de le voir.",
     "Collapse Reply Thread": "Masquer le fil de réponse",
-    "Enable widget screenshots on supported widgets": "Activer les captures d'écran des widgets pris en charge",
-    "Send analytics data": "Envoyer les données analytiques",
+    "Enable widget screenshots on supported widgets": "Activer les captures d’écran pour les widgets pris en charge",
+    "Send analytics data": "Envoyer les données de télémétrie",
     "Muted Users": "Utilisateurs ignorés",
     "Terms and Conditions": "Conditions générales",
-    "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Pour continuer à utiliser le serveur d'accueil %(homeserverDomain)s, vous devez lire et accepter nos conditions générales.",
+    "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Pour continuer à utiliser le serveur d’accueil %(homeserverDomain)s, vous devez lire et accepter nos conditions générales.",
     "Review terms and conditions": "Voir les conditions générales",
     "To continue, please enter your password:": "Pour continuer, veuillez renseigner votre mot de passe :",
-    "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>": "Votre compte sera inutilisable de façon permanente. Vous ne pourrez plus vous reconnecter et personne ne pourra se réenregistrer avec le même identifiant d'utilisateur. Votre compte quittera tous les salons auxquels il participe et tous ses détails seront supprimés du serveur d'identité. <b>Cette action est irréversible.</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>": "Votre compte sera inutilisable de façon permanente. Vous ne pourrez plus vous reconnecter et personne ne pourra se réenregistrer avec le même identifiant d'utilisateur. Votre compte quittera tous les salons auxquels il participe et tous ses détails seront supprimés du serveur d’identité. <b>Cette action est irréversible.</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.": "La désactivation du compte <b>ne nous fait pas oublier les messages que vous avez envoyés par défaut.</b> Si vous souhaitez que nous les oubliions, cochez la case ci-dessous.",
     "e.g. %(exampleValue)s": "par ex. %(exampleValue)s",
     "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "La visibilité des messages dans Matrix est la même que celle des e-mails. Quand nous oublions vos messages, cela signifie que les messages que vous avez envoyés ne seront partagés avec aucun nouvel utilisateur ou avec les utilisateurs non enregistrés, mais les utilisateurs enregistrés qui ont déjà eu accès à ces messages en conserveront leur propre copie.",
-    "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)": "Veuillez oublier tous les messages que j'ai envoyé quand mon compte sera désactivé (<b>Avertissement :</b> les futurs utilisateurs verront des conversations incomplètes)",
-    "Can't leave Server Notices room": "Impossible de quitter le salon des Annonces du serveur",
-    "This room is used for important messages from the Homeserver, so you cannot leave it.": "Ce salon est utilisé pour les messages importants du serveur d'accueil, donc vous ne pouvez pas en partir.",
+    "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)": "Veuillez oublier tous les messages que j’ai envoyé quand mon compte sera désactivé (<b>Avertissement :</b> les futurs utilisateurs verront des conversations incomplètes)",
+    "Can't leave Server Notices room": "Impossible de quitter le salon des annonces au serveur",
+    "This room is used for important messages from the Homeserver, so you cannot leave it.": "Ce salon est utilisé pour les messages importants du serveur d’accueil, vous ne pouvez donc pas en partir.",
     "No Audio Outputs detected": "Aucune sortie audio détectée",
     "Audio Output": "Sortie audio",
-    "Share Link to User": "Partager le lien vers l'utilisateur",
+    "Share Link to User": "Partager le lien vers l’utilisateur",
     "Share room": "Partager le salon",
     "Share Room": "Partager le salon",
     "Link to most recent message": "Lien vers le message le plus récent",
-    "Share User": "Partager l'utilisateur",
+    "Share User": "Partager l’utilisateur",
     "Share Community": "Partager la communauté",
     "Share Room Message": "Partager le message du salon",
     "Link to selected message": "Lien vers le message sélectionné",
     "COPY": "COPIER",
     "Share Message": "Partager le message",
-    "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.": "Dans les salons chiffrés, comme celui-ci, l'aperçu des liens est désactivé par défaut pour s'assurer que le serveur d'accueil (où sont générés les aperçus) ne puisse pas collecter d'informations sur les liens qui apparaissent dans ce salon.",
-    "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.": "Quand quelqu'un met un lien dans son message, un aperçu du lien peut être affiché afin de fournir plus d'informations sur ce lien comme le titre, la description et une image du site.",
+    "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.": "Dans les salons chiffrés, comme celui-ci, l’aperçu des liens est désactivé par défaut pour s’assurer que le serveur d’accueil (où sont générés les aperçus) ne puisse pas collecter d’informations sur les liens qui apparaissent dans ce salon.",
+    "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.": "Quand quelqu’un met un lien dans son message, un aperçu du lien peut être affiché afin de fournir plus d’informations sur ce lien comme le titre, la description et une image du site.",
     "The email field must not be blank.": "Le champ de l'adresse e-mail ne doit pas être vide.",
     "The phone number field must not be blank.": "Le champ du numéro de téléphone ne doit pas être vide.",
     "The password field must not be blank.": "Le champ du mot de passe ne doit pas être vide.",
     "Call in Progress": "Appel en cours",
     "A call is already in progress!": "Un appel est déjà en cours !",
-    "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Vous ne pouvez voir aucun message tant que vous ne lisez et n'acceptez pas nos <consentLink>conditions générales</consentLink>.",
+    "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Vous ne pouvez voir aucun message tant que vous ne lisez et n’acceptez pas nos <consentLink>conditions générales</consentLink>.",
     "Demote yourself?": "Vous rétrograder ?",
     "Demote": "Rétrograder",
-    "This event could not be displayed": "Cet événement n'a pas pu être affiché",
+    "This event could not be displayed": "Cet événement n’a pas pu être affiché",
     "Permission Required": "Autorisation requise",
     "You do not have permission to start a conference call in this room": "Vous n’avez pas l’autorisation de lancer un appel en téléconférence dans ce salon",
     "A call is currently being placed!": "Un appel est en cours !",
@@ -839,51 +839,51 @@
     "An error ocurred whilst trying to remove the widget from the room": "Une erreur est survenue lors de la suppression du widget du salon",
     "System Alerts": "Alertes système",
     "Only room administrators will see this warning": "Seuls les administrateurs du salon verront cet avertissement",
-    "Please <a>contact your service administrator</a> to continue using the service.": "Veuillez <a>contacter l'administrateur de votre service</a> pour continuer à l'utiliser.",
-    "This homeserver has hit its Monthly Active User limit.": "Ce serveur d'accueil a atteint sa limite mensuelle d'utilisateurs actifs.",
-    "This homeserver has exceeded one of its resource limits.": "Ce serveur d'accueil a dépassé une de ses limites de ressources.",
+    "Please <a>contact your service administrator</a> to continue using the service.": "Veuillez <a>contacter l’administrateur de votre service</a> pour continuer à l’utiliser.",
+    "This homeserver has hit its Monthly Active User limit.": "Ce serveur d’accueil a atteint sa limite mensuelle d'utilisateurs actifs.",
+    "This homeserver has exceeded one of its resource limits.": "Ce serveur d’accueil a dépassé une de ses limites de ressources.",
     "Upgrade Room Version": "Mettre à niveau la version du salon",
     "Create a new room with the same name, description and avatar": "Créer un salon avec le même nom, la même description et le même avatar",
-    "Update any local room aliases to point to the new room": "Mettre à jour tous les alias du salon locaux pour qu'ils dirigent vers le nouveau salon",
-    "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "Empêcher les utilisateurs de discuter dans l'ancienne version du salon et envoyer un message conseillant aux nouveaux utilisateurs d'aller dans le nouveau salon",
-    "Put a link back to the old room at the start of the new room so people can see old messages": "Fournir un lien vers l'ancien salon au début du nouveau salon pour que l'on puisse voir les vieux messages",
-    "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.": "Votre message n'a pas été envoyé car le serveur d'accueil a atteint sa limite mensuelle d'utilisateurs. Veuillez <a>contacter l'administrateur de votre service</a> pour continuer à l'utiliser.",
-    "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.": "Votre message n'a pas été envoyé car ce serveur d'accueil a dépassé une de ses limites de ressources. Veuillez <a>contacter l'administrateur de votre service</a> pour continuer à l'utiliser.",
-    "Please <a>contact your service administrator</a> to continue using this service.": "Veuillez <a>contacter l'administrateur de votre service</a> pour continuer à l'utiliser.",
-    "Sorry, your homeserver is too old to participate in this room.": "Désolé, votre serveur d'accueil est trop vieux pour participer à ce salon.",
-    "Please contact your homeserver administrator.": "Veuillez contacter l'administrateur de votre serveur d'accueil.",
+    "Update any local room aliases to point to the new room": "Mettre à jour tous les alias du salon locaux pour qu’ils dirigent vers le nouveau salon",
+    "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "Empêcher les utilisateurs de discuter dans l’ancienne version du salon et envoyer un message conseillant aux nouveaux utilisateurs d’aller dans le nouveau salon",
+    "Put a link back to the old room at the start of the new room so people can see old messages": "Fournir un lien vers l’ancien salon au début du nouveau salon pour qu’il soit possible de consulter les anciens messages",
+    "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.": "Votre message n’a pas été envoyé car le serveur d’accueil a atteint sa limite mensuelle d’utilisateurs. Veuillez <a>contacter l’administrateur de votre service</a> pour continuer à l’utiliser.",
+    "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.": "Votre message n’a pas été envoyé car ce serveur d’accueil a dépassé une de ses limites de ressources. Veuillez <a>contacter l’administrateur de votre service</a> pour continuer à l’utiliser.",
+    "Please <a>contact your service administrator</a> to continue using this service.": "Veuillez <a>contacter l’administrateur de votre service</a> pour continuer à l’utiliser.",
+    "Sorry, your homeserver is too old to participate in this room.": "Désolé, votre serveur d’accueil est trop vieux pour participer à ce salon.",
+    "Please contact your homeserver administrator.": "Veuillez contacter l’administrateur de votre serveur d’accueil.",
     "Legal": "Légal",
-    "This room has been replaced and is no longer active.": "Ce salon a été remplacé et n'est plus actif.",
+    "This room has been replaced and is no longer active.": "Ce salon a été remplacé et n’est plus actif.",
     "The conversation continues here.": "La discussion continue ici.",
-    "This room is a continuation of another conversation.": "Ce salon est la suite d'une autre discussion.",
-    "Click here to see older messages.": "Cliquer ici pour voir les vieux messages.",
+    "This room is a continuation of another conversation.": "Ce salon est la suite d’une autre discussion.",
+    "Click here to see older messages.": "Cliquer ici pour voir les anciens messages.",
     "Failed to upgrade room": "Échec de la mise à niveau du salon",
-    "The room upgrade could not be completed": "La mise à niveau du salon n'a pas pu être effectuée",
+    "The room upgrade could not be completed": "La mise à niveau du salon n’a pas pu être effectuée",
     "Upgrade this room to version %(version)s": "Mettre à niveau ce salon vers la version %(version)s",
     "Forces the current outbound group session in an encrypted room to be discarded": "Force la session de groupe sortante actuelle dans un salon chiffré à être rejetée",
-    "Unable to connect to Homeserver. Retrying...": "Impossible de se connecter au serveur d'accueil. Reconnexion...",
+    "Unable to connect to Homeserver. Retrying...": "Impossible de se connecter au serveur d’accueil. Reconnexion…",
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s a défini l’adresse principale pour ce salon comme %(address)s.",
     "%(senderName)s removed the main address for this room.": "%(senderName)s a supprimé l’adresse principale de ce salon.",
-    "%(brand)s now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!": "%(brand)s utilise maintenant 3 à 5 fois moins de mémoire, en ne chargeant les informations des autres utilisateurs que quand elles sont nécessaires. Veuillez patienter pendant que l'on se resynchronise avec le serveur !",
+    "%(brand)s now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!": "%(brand)s utilise maintenant 3 à 5 fois moins de mémoire, en ne chargeant les informations des autres utilisateurs que quand elles sont nécessaires. Veuillez patienter pendant que l’on se resynchronise avec le serveur !",
     "Updating %(brand)s": "Mise à jour de %(brand)s",
     "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Avant de soumettre vos journaux, vous devez <a>créer une « issue » sur GitHub</a> pour décrire votre problème.",
-    "You've previously used %(brand)s 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, %(brand)s needs to resync your account.": "Vous avez utilisé auparavant %(brand)s sur %(host)s avec le chargement différé activé. Dans cette version le chargement différé est désactivé. Comme le cache local n'est pas compatible entre ces deux réglages, %(brand)s doit resynchroniser votre compte.",
-    "If the other version of %(brand)s is still open in another tab, please close it as using %(brand)s on the same host with both lazy loading enabled and disabled simultaneously will cause issues.": "Si l'autre version de %(brand)s est encore ouverte dans un autre onglet, merci de le fermer car l'utilisation de %(brand)s sur le même hôte avec le chargement différé activé et désactivé à la fois causera des problèmes.",
+    "You've previously used %(brand)s 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, %(brand)s needs to resync your account.": "Vous avez utilisé auparavant %(brand)s sur %(host)s avec le chargement différé activé. Dans cette version le chargement différé est désactivé. Comme le cache local n’est pas compatible entre ces deux réglages, %(brand)s doit resynchroniser votre compte.",
+    "If the other version of %(brand)s is still open in another tab, please close it as using %(brand)s on the same host with both lazy loading enabled and disabled simultaneously will cause issues.": "Si l’autre version de %(brand)s est encore ouverte dans un autre onglet, merci de le fermer car l’utilisation de %(brand)s sur le même hôte avec le chargement différé activé et désactivé à la fois causera des problèmes.",
     "Incompatible local cache": "Cache local incompatible",
     "Clear cache and resync": "Vider le cache et resynchroniser",
-    "Please review and accept the policies of this homeserver:": "Veuillez lire et accepter les politiques de ce serveur d'accueil :",
+    "Please review and accept the policies of this homeserver:": "Veuillez lire et accepter les politiques de ce serveur d’accueil :",
     "Add some now": "En ajouter maintenant",
-    "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Vous êtes administrateur de cette communauté. Vous ne pourrez pas revenir sans une invitation d'un autre administrateur.",
+    "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Vous êtes administrateur de cette communauté. Vous ne pourrez pas revenir sans une invitation d’un autre administrateur.",
     "Open Devtools": "Ouvrir les outils développeur",
     "Show developer tools": "Afficher les outils de développeur",
-    "Please review and accept all of the homeserver's policies": "Veuillez lire et accepter toutes les politiques du serveur d'accueil",
-    "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 %(brand)s to do this": "Pour éviter de perdre l'historique de vos discussions, vous devez exporter vos clés avant de vous déconnecter. Vous devez revenir à une version plus récente de %(brand)s pour pouvoir le faire",
+    "Please review and accept all of the homeserver's policies": "Veuillez lire et accepter toutes les politiques du serveur d’accueil",
+    "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 %(brand)s to do this": "Pour éviter de perdre l’historique de vos discussions, vous devez exporter vos clés avant de vous déconnecter. Vous devez revenir à une version plus récente de %(brand)s pour pouvoir le faire",
     "Incompatible Database": "Base de données incompatible",
     "Continue With Encryption Disabled": "Continuer avec le chiffrement désactivé",
-    "Sign in with single sign-on": "Se connecter avec l'authentification unique",
+    "Sign in with single sign-on": "Se connecter avec l’authentification unique",
     "Unable to load! Check your network connectivity and try again.": "Chargement impossible ! Vérifiez votre connexion au réseau et réessayez.",
     "Delete Backup": "Supprimer la sauvegarde",
-    "Unable to load key backup status": "Impossible de charger l'état de sauvegarde des clés",
+    "Unable to load key backup status": "Impossible de charger l’état de sauvegarde des clés",
     "Backup version: ": "Version de la sauvegarde : ",
     "Algorithm: ": "Algorithme : ",
     "Next": "Suivant",
@@ -897,28 +897,28 @@
     "Set up Secure Message Recovery": "Configurer la récupération de messages sécurisée",
     "Unable to create key backup": "Impossible de créer la sauvegarde des clés",
     "Retry": "Réessayer",
-    "Unable to load backup status": "Impossible de charger l'état de la sauvegarde",
+    "Unable to load backup status": "Impossible de récupérer l’état de la sauvegarde",
     "Unable to restore backup": "Impossible de restaurer la sauvegarde",
-    "No backup found!": "Aucune sauvegarde n'a été trouvée !",
+    "No backup found!": "Aucune sauvegarde n’a été trouvée !",
     "Failed to decrypt %(failedCount)s sessions!": "Le déchiffrement de %(failedCount)s sessions a échoué !",
     "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Accédez à l'historique sécurisé de vos messages et configurez la messagerie sécurisée en renseignant votre phrase 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 de récupération vous pouvez <button1>utiliser votre clé de récupération</button1> ou <button2>configurer de nouvelles options de récupération</button2>",
     "This looks like a valid recovery key!": "Cela ressemble à une clé de récupération valide !",
     "Not a valid recovery key": "Ce n'est pas une clé de récupération valide",
     "Access your secure message history and set up secure messaging by entering your recovery key.": "Accédez à l'historique sécurisé de vos messages et configurez la messagerie sécurisée en renseignant votre clé de récupération.",
-    "Failed to perform homeserver discovery": "Échec lors de la découverte du serveur d'accueil",
-    "Invalid homeserver discovery response": "Réponse de découverte du serveur d'accueil non valide",
+    "Failed to perform homeserver discovery": "Échec lors de la découverte du serveur d’accueil",
+    "Invalid homeserver discovery response": "Réponse de découverte du serveur d’accueil non valide",
     "Use a few words, avoid common phrases": "Utilisez quelques mots, évitez les phrases courantes",
-    "No need for symbols, digits, or uppercase letters": "Il n'y a pas besoin de symboles, de chiffres ou de majuscules",
+    "No need for symbols, digits, or uppercase letters": "Il n'y a pas besoin de symbole, de chiffre ou de majuscule",
     "Avoid repeated words and characters": "Évitez de répéter des mots et des caractères",
     "Avoid sequences": "Évitez les séquences",
     "Avoid recent years": "Évitez les années récentes",
     "Avoid years that are associated with you": "Évitez les années qui ont un rapport avec vous",
     "Avoid dates and years that are associated with you": "Évitez les dates et les années qui ont un rapport avec vous",
-    "Capitalization doesn't help very much": "Les majuscules n'aident pas vraiment",
-    "All-uppercase is almost as easy to guess as all-lowercase": "Uniquement des majuscules, c'est presque aussi facile à deviner qu'uniquement des minuscules",
+    "Capitalization doesn't help very much": "Les majuscules n’aident pas vraiment",
+    "All-uppercase is almost as easy to guess as all-lowercase": "Uniquement des majuscules, c’est presque aussi facile à deviner qu’uniquement des minuscules",
     "Reversed words aren't much harder to guess": "Les mots inversés ne sont pas beaucoup plus difficiles à deviner",
-    "Predictable substitutions like '@' instead of 'a' don't help very much": "Les substitutions prévisibles comme « @ » à la place de « a » n'aident pas vraiment",
+    "Predictable substitutions like '@' instead of 'a' don't help very much": "Les substitutions prévisibles comme « @ » à la place de « a » ne sont pas très utiles",
     "Add another word or two. Uncommon words are better.": "Ajoutez un ou deux mots. Les mots rares sont à privilégier.",
     "Repeats like \"aaa\" are easy to guess": "Les répétitions comme « aaa » sont faciles à deviner",
     "Repeats like \"abcabcabc\" are only slightly harder to guess than \"abc\"": "Les répétitions comme « abcabcabc » ne sont pas beaucoup plus difficiles à deviner que « abc »",
@@ -927,7 +927,7 @@
     "Dates are often easy to guess": "Les dates sont généralement faciles à deviner",
     "This is a top-10 common password": "Cela fait partie des 10 mots de passe les plus répandus",
     "This is a top-100 common password": "Cela fait partie des 100 mots de passe les plus répandus",
-    "This is a very common password": "C'est un mot de passe très répandu",
+    "This is a very common password": "C’est un mot de passe très répandu",
     "This is similar to a commonly used password": "Cela ressemble à un mot de passe répandu",
     "A word by itself is easy to guess": "Un mot seul est facile à deviner",
     "Names and surnames by themselves are easy to guess": "Les noms et prénoms seuls sont faciles à deviner",
@@ -936,8 +936,8 @@
     "Failed to load group members": "Échec du chargement des membres du groupe",
     "Failed to invite users to the room:": "Échec de l’invitation d'utilisateurs dans le salon :",
     "There was an error joining the room": "Une erreur est survenue en rejoignant le salon",
-    "You do not have permission to invite people to this room.": "Vous n'avez pas la permission d'envoyer des invitations dans ce salon.",
-    "User %(user_id)s does not exist": "L'utilisateur %(user_id)s n'existe pas",
+    "You do not have permission to invite people to this room.": "Vous n’avez pas la permission d’envoyer des invitations dans ce salon.",
+    "User %(user_id)s does not exist": "L’utilisateur %(user_id)s n’existe pas",
     "Unknown server error": "Erreur de serveur inconnue",
     "Show a reminder to enable Secure Message Recovery in encrypted rooms": "Afficher un rappel pour activer la récupération de messages sécurisée dans les salons chiffrés",
     "Don't ask again": "Ne plus me demander",
@@ -952,23 +952,23 @@
     "Invalid identity server discovery response": "Réponse non valide lors de la découverte du serveur d'identité",
     "General failure": "Erreur générale",
     "New Recovery Method": "Nouvelle méthode de récupération",
-    "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Si vous n'avez pas activé de nouvelle méthode de récupération, un attaquant essaye peut-être d'accéder à votre compte. Changez immédiatement le mot de passe de votre compte et configurez une nouvelle méthode de récupération dans les paramètres.",
+    "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Si vous n’avez pas activé de nouvelle méthode de récupération, un attaquant essaye peut-être d’accéder à votre compte. Changez immédiatement le mot de passe de votre compte et configurez une nouvelle méthode de récupération dans les paramètres.",
     "Set up Secure Messages": "Configurer les messages sécurisés",
     "Go to Settings": "Aller aux paramètres",
     "Straight rows of keys are easy to guess": "Les suites de touches sont faciles à deviner",
     "Short keyboard patterns are easy to guess": "Les répétitions de motif court sur un clavier sont faciles à deviner",
-    "Custom user status messages": "Messages de statut de l'utilisateur personnalisés",
-    "Unable to load commit detail: %(msg)s": "Impossible de charger les détails de l'envoi : %(msg)s",
+    "Custom user status messages": "Messages de statut de l’utilisateur personnalisés",
+    "Unable to load commit detail: %(msg)s": "Impossible de charger les détails de l’envoi : %(msg)s",
     "Set a new status...": "Configurer un nouveau statut…",
     "Clear status": "Effacer le statut",
     "Unrecognised address": "Adresse non reconnue",
-    "User %(user_id)s may or may not exist": "L'utilisateur %(user_id)s pourrait exister",
+    "User %(user_id)s may or may not exist": "L’utilisateur %(user_id)s pourrait exister",
     "The following users may not exist": "Les utilisateurs suivants pourraient ne pas exister",
-    "Prompt before sending invites to potentially invalid matrix IDs": "Demander avant d'envoyer des invitations à des identifiants matrix potentiellement non valides",
+    "Prompt before sending invites to potentially invalid matrix IDs": "Demander avant d’envoyer des invitations à des identifiants matrix potentiellement non valides",
     "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "Impossible de trouver les profils pour les identifiants Matrix listés ci-dessous. Voulez-vous quand même les inviter ?",
     "Invite anyway and never warn me again": "Inviter quand même et ne plus me prévenir",
     "Invite anyway": "Inviter quand même",
-    "Whether or not you're logged in (we don't record your username)": "Si vous êtes connecté ou pas (votre nom d'utilisateur n’est pas enregistré)",
+    "Whether or not you're logged in (we don't record your username)": "Si vous êtes connecté ou pas (votre nom d’utilisateur n’est pas enregistré)",
     "Upgrades a room to a new version": "Met à niveau un salon vers une nouvelle version",
     "Sets the room name": "Définit le nom du salon",
     "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s a mis à niveau ce salon.",
@@ -979,15 +979,15 @@
     "Enable Emoji suggestions while typing": "Activer la suggestion d’émojis lors de la saisie",
     "Render simple counters in room header": "Afficher des compteurs simples dans l’en-tête des salons",
     "Show a placeholder for removed messages": "Afficher les messages supprimés",
-    "Show join/leave messages (invites/kicks/bans unaffected)": "Afficher les messages d'arrivée et de départ (les invitations/expulsions/bannissements ne sont pas concernés)",
-    "Show avatar changes": "Afficher les changements d'avatar",
-    "Show display name changes": "Afficher les changements de nom affiché",
-    "Show avatars in user and room mentions": "Afficher les avatars dans les mentions d'utilisateur et de salon",
+    "Show join/leave messages (invites/kicks/bans unaffected)": "Afficher les messages d’arrivée et de départ (les invitations/expulsions/bannissements ne sont pas concernés)",
+    "Show avatar changes": "Afficher les changements d’avatar",
+    "Show display name changes": "Afficher les changements de nom d’affichage",
+    "Show avatars in user and room mentions": "Afficher les avatars dans les mentions d’utilisateur et de salon",
     "Enable big emoji in chat": "Activer les gros émojis dans les discussions",
     "Send typing notifications": "Envoyer des notifications de saisie",
     "Enable Community Filter Panel": "Activer le panneau de filtrage de communauté",
-    "Messages containing my username": "Messages contenant mon nom d'utilisateur",
-    "The other party cancelled the verification.": "L'autre personne a annulé la vérification.",
+    "Messages containing my username": "Messages contenant mon nom d’utilisateur",
+    "The other party cancelled the verification.": "L’autre personne a annulé la vérification.",
     "Verified!": "Vérifié !",
     "You've successfully verified this user.": "Vous avez vérifié cet utilisateur avec succès.",
     "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Les messages sécurisés avec cet utilisateur sont chiffrés de bout en bout et ne peuvent être lus par d’autres personnes.",
@@ -995,16 +995,16 @@
     "Verify this user by confirming the following number appears on their screen.": "Vérifier cet utilisateur en confirmant que le nombre suivant apparaît sur leur écran.",
     "Yes": "Oui",
     "No": "Non",
-    "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.": "Nous vous avons envoyé un e-mail pour vérifier votre adresse. Veuillez suivre les instructions qu'il contient puis cliquer sur le bouton ci-dessous.",
+    "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.": "Nous vous avons envoyé un e-mail pour vérifier votre adresse. Veuillez suivre les instructions qu’il contient puis cliquer sur le bouton ci-dessous.",
     "Email Address": "Adresse e-mail",
-    "Backing up %(sessionsRemaining)s keys...": "Sauvegarde de %(sessionsRemaining)s clés...",
+    "Backing up %(sessionsRemaining)s keys...": "Sauvegarde de %(sessionsRemaining)s clés…",
     "All keys backed up": "Toutes les clés ont été sauvegardées",
     "Add an email address to configure email notifications": "Ajouter une adresse e-mail pour configurer les notifications par e-mail",
     "Unable to verify phone number.": "Impossible de vérifier le numéro de téléphone.",
     "Verification code": "Code de vérification",
     "Phone Number": "Numéro de téléphone",
     "Profile picture": "Image de profil",
-    "Display Name": "Nom affiché",
+    "Display Name": "Nom d’affichage",
     "Room information": "Information du salon",
     "Internal room ID:": "Identifiant interne du salon :",
     "Room version": "Version du salon",
@@ -1018,37 +1018,37 @@
     "Language and region": "Langue et région",
     "Theme": "Thème",
     "Account management": "Gestion du compte",
-    "Deactivating your account is a permanent action - be careful!": "La désactivation du compte est une action permanente. Soyez prudent !",
-    "For help with using %(brand)s, click <a>here</a>.": "Pour obtenir de l'aide sur l'utilisation de %(brand)s, cliquez <a>ici</a>.",
-    "For help with using %(brand)s, click <a>here</a> or start a chat with our bot using the button below.": "Pour obtenir de l'aide sur l'utilisation de %(brand)s, cliquez <a>ici</a> ou commencez une discussion avec notre bot en utilisant le bouton ci-dessous.",
-    "Help & About": "Aide & À propos",
-    "Bug reporting": "Signalement d'anomalies",
+    "Deactivating your account is a permanent action - be careful!": "La désactivation du compte est une action définitive. Soyez prudents !",
+    "For help with using %(brand)s, click <a>here</a>.": "Pour obtenir de l’aide sur l’utilisation de %(brand)s, cliquez <a>ici</a>.",
+    "For help with using %(brand)s, click <a>here</a> or start a chat with our bot using the button below.": "Pour obtenir de l’aide sur l’utilisation de %(brand)s, cliquez <a>ici</a> ou commencez une discussion avec notre bot en utilisant le bouton ci-dessous.",
+    "Help & About": "Aide et À propos",
+    "Bug reporting": "Signalement d’anomalies",
     "FAQ": "FAQ",
     "Versions": "Versions",
     "Preferences": "Préférences",
     "Composer": "Compositeur",
     "Room list": "Liste de salons",
-    "Timeline": "Historique",
-    "Autocomplete delay (ms)": "Délai pour l'autocomplétion (ms)",
+    "Timeline": "Fil de discussion",
+    "Autocomplete delay (ms)": "Retard pour l’autocomplétion (ms)",
     "Chat with %(brand)s Bot": "Discuter avec le bot %(brand)s",
-    "Roles & Permissions": "Rôles & Permissions",
-    "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Les modifications concernant l'accès à l'historique ne s'appliqueront qu'aux futurs messages de ce salon. La visibilité de l'historique existant ne sera pas modifiée.",
-    "Security & Privacy": "Sécurité & Vie privée",
+    "Roles & Permissions": "Rôles et permissions",
+    "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Les modifications concernant l'accès à l’historique ne s'appliqueront qu’aux futurs messages de ce salon. La visibilité de l’historique existant ne sera pas modifiée.",
+    "Security & Privacy": "Sécurité et vie privée",
     "Encryption": "Chiffrement",
-    "Once enabled, encryption cannot be disabled.": "Le chiffrement ne peut pas être désactivé une fois qu'il a été activé.",
+    "Once enabled, encryption cannot be disabled.": "Le chiffrement ne peut pas être désactivé une fois qu’il a été activé.",
     "Encrypted": "Chiffré",
     "Ignored users": "Utilisateurs ignorés",
     "Bulk options": "Options de groupe",
     "Key backup": "Sauvegarde de clés",
     "Missing media permissions, click the button below to request.": "Permissions multimédia manquantes, cliquez sur le bouton ci-dessous pour la demander.",
     "Request media permissions": "Demander les permissions multimédia",
-    "Voice & Video": "Voix & Vidéo",
-    "Main address": "Adresse princpale",
+    "Voice & Video": "Audio et vidéo",
+    "Main address": "Adresse principale",
     "Room avatar": "Avatar du salon",
     "Room Name": "Nom du salon",
     "Room Topic": "Sujet du salon",
     "Join": "Rejoindre",
-    "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Vérifier cet utilisateur pour le marquer comme fiable. Faire confiance aux utilisateurs vous permet d’être serein quand vous utilisez des messages chiffrés de bout en bout.",
+    "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Vérifier cet utilisateur pour le marquer comme fiable. Faire confiance aux utilisateurs vous permet d’être tranquille lorsque vous utilisez des messages chiffrés de bout en bout.",
     "Waiting for partner to confirm...": "Nous attendons que le partenaire confirme…",
     "Incoming Verification Request": "Demande de vérification entrante",
     "Go back": "Revenir en arrière",
@@ -1060,7 +1060,7 @@
     "Enter the location of your Modular homeserver. It may use your own domain name or be a subdomain of <a>modular.im</a>.": "Saisissez l'emplacement de votre serveur d'accueil Modular. Il peut utiliser votre nom de domaine personnel ou être un sous-domaine de <a>modular.im</a>.",
     "Server Name": "Nom du serveur",
     "The username field must not be blank.": "Le champ du nom d'utilisateur ne doit pas être vide.",
-    "Username": "Nom d'utilisateur",
+    "Username": "Nom d’utilisateur",
     "Not sure of your password? <a>Set a new one</a>": "Vous n'êtes pas sûr(e) de votre mot de passe ? <a>Changez-le</a>",
     "Create your account": "Créer votre compte",
     "Email (optional)": "E-mail (facultatif)",
@@ -1070,20 +1070,20 @@
     "Homeserver URL": "URL du serveur d'accueil",
     "Identity Server URL": "URL du serveur d'identité",
     "Free": "Gratuit",
-    "Join millions for free on the largest public server": "Rejoignez des millions d'utilisateurs gratuitement sur le plus grand serveur public",
+    "Join millions for free on the largest public server": "Rejoignez des millions d’utilisateurs gratuitement sur le plus grand serveur public",
     "Premium": "Premium",
     "Premium hosting for organisations <a>Learn more</a>": "Hébergement premium pour les organisations <a>En savoir plus</a>",
     "Other": "Autre",
     "Find other public servers or use a custom server": "Trouvez d'autres serveurs publics ou utilisez un serveur personnalisé",
     "Guest": "Visiteur",
-    "Sign in instead": "Se connecter",
+    "Sign in instead": "Se connecter plutôt",
     "Set a new password": "Définir un nouveau mot de passe",
     "Create account": "Créer un compte",
     "Keep going...": "Continuer…",
     "Starting backup...": "Début de la sauvegarde…",
     "A new recovery passphrase and key for Secure Messages have been detected.": "Un nouveau mot de passe et une nouvelle clé de récupération pour les messages sécurisés ont été détectés.",
     "Recovery Method Removed": "Méthode de récupération supprimée",
-    "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Si vous n'avez pas supprimé la méthode de récupération, un attaquant peut être en train d'essayer d'accéder à votre compte. Modifiez le mot de passe de votre compte et configurez une nouvelle méthode de récupération dans les réglages.",
+    "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Si vous n’avez pas supprimé la méthode de récupération, un attaquant peut être en train d’essayer d’accéder à votre compte. Modifiez le mot de passe de votre compte et configurez une nouvelle méthode de récupération dans les réglages.",
     "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Le fichier « %(fileName)s » dépasse la taille limite autorisée par ce serveur pour les envois",
     "Gets or sets the room topic": "Récupère ou définit le sujet du salon",
     "This room has no topic.": "Ce salon n'a pas de sujet.",
@@ -1158,16 +1158,16 @@
     "Headphones": "Écouteurs",
     "Folder": "Dossier",
     "Pin": "Épingle",
-    "This homeserver would like to make sure you are not a robot.": "Ce serveur d'accueil veut s'assurer que vous n'êtes pas un robot.",
+    "This homeserver would like to make sure you are not a robot.": "Ce serveur d’accueil veut s’assurer que vous n’êtes pas un robot.",
     "Change": "Changer",
     "Couldn't load page": "Impossible de charger la page",
-    "This homeserver does not support communities": "Ce serveur d'accueil ne prend pas en charge les communautés",
+    "This homeserver does not support communities": "Ce serveur d’accueil ne prend pas en charge les communautés",
     "A verification email will be sent to your inbox to confirm setting your new password.": "Un e-mail de vérification sera envoyé à votre adresse pour confirmer la modification de votre mot de passe.",
     "Your password has been reset.": "Votre mot de passe a été réinitialisé.",
-    "This homeserver does not support login using email address.": "Ce serveur d'accueil ne prend pas en charge la connexion avec une adresse e-mail.",
-    "Registration has been disabled on this homeserver.": "L'inscription a été désactivée sur ce serveur d'accueil.",
-    "Unable to query for supported registration methods.": "Impossible de demander les méthodes d'inscription prises en charge.",
-    "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "En êtes-vous sûr(e) ? Vous perdrez vos messages chiffrés si vos clés ne sont pas sauvegardées correctement.",
+    "This homeserver does not support login using email address.": "Ce serveur d’accueil ne prend pas en charge la connexion avec une adresse e-mail.",
+    "Registration has been disabled on this homeserver.": "L’inscription a été désactivée sur ce serveur d’accueil.",
+    "Unable to query for supported registration methods.": "Impossible de demander les méthodes d’inscription prises en charge.",
+    "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "En êtes-vous sûr ? Vous perdrez vos messages chiffrés si vos clés ne sont pas sauvegardées correctement.",
     "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Les messages chiffrés sont sécurisés avec un chiffrement de bout en bout. Seuls vous et le(s) destinataire(s) ont les clés pour lire ces messages.",
     "Restore from Backup": "Restaurer depuis la sauvegarde",
     "Back up your keys before signing out to avoid losing them.": "Sauvegardez vos clés avant de vous déconnecter pour éviter de les perdre.",
@@ -1189,7 +1189,7 @@
     "Allow Peer-to-Peer for 1:1 calls": "Autoriser les connexions pair-à-pair pour les appels individuels",
     "Credits": "Crédits",
     "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "Si vous avez rencontré des problèmes ou si vous souhaitez partager votre avis, dites-le nous sur GitHub.",
-    "Changes your display nickname in the current room only": "Change votre nom affiché seulement dans le salon actuel",
+    "Changes your display nickname in the current room only": "Change votre nom d’affichage seulement dans le salon actuel",
     "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s a activé le badge pour %(groups)s dans ce salon.",
     "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s a désactivé le badge pour %(groups)s dans ce salon.",
     "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s a activé le badge pour %(newGroups)s et désactivé le badge pour %(oldGroups)s dans ce salon.",
@@ -1242,7 +1242,7 @@
     "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "Ce salon utilise la version <roomVersion />, que ce serveur d’accueil a marqué comme <i>instable</i>.",
     "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "La mise à niveau du salon désactivera cette instance du salon et créera un salon mis à niveau avec le même nom.",
     "Failed to revoke invite": "Échec de la révocation de l’invitation",
-    "Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.": "Impossible de révoquer l’invitation. Le serveur subi peut-être un problème temporaire ou vous n’avez pas la permission de révoquer l’invitation.",
+    "Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.": "Impossible de révoquer l’invitation. Le serveur subit peut-être un problème temporaire ou vous n’avez pas la permission de révoquer l’invitation.",
     "Revoke invite": "Révoquer l’invitation",
     "Invited by %(sender)s": "Invité par %(sender)s",
     "Maximize apps": "Maximiser les applications",
@@ -1295,11 +1295,11 @@
     "Join the conversation with an account": "Rejoindre la conversation avec un compte",
     "Sign Up": "S’inscrire",
     "Sign In": "Se connecter",
-    "You were kicked from %(roomName)s by %(memberName)s": "Vous avez été expulsé(e) de %(roomName)s par %(memberName)s",
+    "You were kicked from %(roomName)s by %(memberName)s": "Vous avez été expulsé de %(roomName)s par %(memberName)s",
     "Reason: %(reason)s": "Motif : %(reason)s",
     "Forget this room": "Oublier ce salon",
     "Re-join": "Revenir",
-    "You were banned from %(roomName)s by %(memberName)s": "Vous avez été banni(e) de %(roomName)s par %(memberName)s",
+    "You were banned from %(roomName)s by %(memberName)s": "Vous avez été banni de %(roomName)s par %(memberName)s",
     "Something went wrong with your invite to %(roomName)s": "Une erreur est survenue avec votre invitation à %(roomName)s",
     "You can only join it with a working invite.": "Vous ne pouvez le rejoindre qu’avec une invitation fonctionnelle.",
     "You can still join it because this is a public room.": "Vous pouvez quand même le rejoindre car c’est un salon public.",
@@ -1307,7 +1307,7 @@
     "Try to join anyway": "Essayer de le rejoindre quand même",
     "Do you want to chat with %(user)s?": "Voulez-vous discuter avec %(user)s ?",
     "Do you want to join %(roomName)s?": "Voulez-vous rejoindre %(roomName)s ?",
-    "<userName/> invited you": "<userName/> vous a invité(e)",
+    "<userName/> invited you": "<userName/> vous a invité",
     "You're previewing %(roomName)s. Want to join it?": "Ceci est un aperçu de %(roomName)s. Voulez-vous rejoindre le salon ?",
     "%(roomName)s can't be previewed. Do you want to join it?": "Vous ne pouvez pas avoir d’aperçu de %(roomName)s. Voulez-vous rejoindre le salon ?",
     "This room doesn't exist. Are you sure you're at the right place?": "Ce salon n’existe pas. Êtes-vous vraiment au bon endroit ?",
@@ -1315,7 +1315,7 @@
     "%(errcode)s was returned while trying to access the room. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "%(errcode)s a été retourné en essayant d’accéder au salon. Si vous pensez que vous ne devriez pas voir ce message, veuillez <issueLink>soumettre un rapport d’anomalie</issueLink>.",
     "This room has already been upgraded.": "Ce salon a déjà été mis à niveau.",
     "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith>ont réagi avec %(shortName)s</reactedWith>",
-    "edited": "édité",
+    "edited": "modifié",
     "Rotate Left": "Tourner à gauche",
     "Rotate Right": "Tourner à droite",
     "View Servers in Room": "Voir les serveurs dans le salon",
@@ -1336,10 +1336,10 @@
     "Homeserver URL does not appear to be a valid Matrix homeserver": "L’URL du serveur d’accueil ne semble pas être un serveur d’accueil Matrix valide",
     "Invalid base_url for m.identity_server": "base_url pour m.identity_server non valide",
     "Identity server URL does not appear to be a valid identity server": "L’URL du serveur d’identité ne semble pas être un serveur d’identité valide",
-    "Show hidden events in timeline": "Afficher les évènements cachés dans l’historique",
+    "Show hidden events in timeline": "Afficher les évènements cachés dans le fil de discussion",
     "Your profile": "Votre profil",
     "Add room": "Ajouter un salon",
-    "Edit message": "Éditer le message",
+    "Edit message": "Modifier le message",
     "No homeserver URL provided": "Aucune URL de serveur d’accueil fournie",
     "Unexpected error resolving homeserver configuration": "Une erreur inattendue est survenue pendant la résolution de la configuration du serveur d’accueil",
     "Unable to validate homeserver/identity server": "Impossible de valider le serveur d’accueil/d’identité",
@@ -1369,8 +1369,8 @@
     "Upload all": "Tout envoyer",
     "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).": "Votre nouveau compte (%(newAccountId)s) est créé, mais vous êtes déjà connecté avec un autre compte (%(loggedInUserId)s).",
     "Continue with previous account": "Continuer avec le compte précédent",
-    "Edited at %(date)s. Click to view edits.": "Édité à %(date)s. Cliquer pour voir les éditions.",
-    "Message edits": "Éditions du message",
+    "Edited at %(date)s. Click to view edits.": "Modifié le %(date)s. Cliquer pour voir les modifications.",
+    "Message edits": "Modifications du message",
     "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:": "La mise à niveau de ce salon nécessite de fermer l’instance actuelle du salon et de créer un nouveau salon à la place. Pour fournir la meilleure expérience possible aux utilisateurs, nous allons :",
     "Loading room preview": "Chargement de l’aperçu du salon",
     "Show all": "Tout afficher",
@@ -1379,12 +1379,12 @@
     "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)s n’ont fait aucun changement",
     "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)s n’a fait aucun changement %(count)s fois",
     "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)s n’a fait aucun changement",
-    "Resend edit": "Renvoyer l’édition",
+    "Resend edit": "Renvoyer la modification",
     "Resend %(unsentCount)s reaction(s)": "Renvoyer %(unsentCount)s réaction(s)",
     "Resend removal": "Renvoyer la suppression",
     "Your homeserver doesn't seem to support this feature.": "Il semble que votre serveur d’accueil ne prenne pas en charge cette fonctionnalité.",
     "Changes your avatar in all rooms": "Change votre avatar dans tous les salons",
-    "You're signed out": "Vous êtes déconnecté(e)",
+    "You're signed out": "Vous êtes déconnecté",
     "Clear all data": "Supprimer toutes les données",
     "Removing…": "Suppression…",
     "Failed to re-authenticate due to a homeserver problem": "Échec de la ré-authentification à cause d’un problème du serveur d’accueil",
@@ -1397,8 +1397,8 @@
     "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Dites-nous ce qui s’est mal passé ou, encore mieux, créez un rapport d’erreur sur GitHub qui décrit le problème.",
     "Identity Server": "Serveur d’identité",
     "Find others by phone or email": "Trouver d’autres personnes par téléphone ou e-mail",
-    "Be found by phone or email": "Être trouvé(e) par téléphone ou e-mail",
-    "Use bots, bridges, widgets and sticker packs": "Utiliser des robots, des passerelles, des widgets ou des packs de stickers",
+    "Be found by phone or email": "Être trouvé par téléphone ou e-mail",
+    "Use bots, bridges, widgets and sticker packs": "Utiliser des robots, des passerelles, des widgets ou des jeux d’autocollants",
     "Terms of Service": "Conditions de service",
     "Service": "Service",
     "Summary": "Résumé",
@@ -1418,14 +1418,14 @@
     "Unable to share phone number": "Impossible de partager le numéro de téléphone",
     "Please enter verification code sent via text.": "Veuillez saisir le code de vérification envoyé par SMS.",
     "Discovery options will appear once you have added a phone number above.": "Les options de découverte apparaîtront quand vous aurez ajouté un numéro de téléphone ci-dessus.",
-    "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "Un message textuel a été envoyé à +%(msisdn)s. Saisissez le code de vérification qu’il contient.",
+    "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "Un SMS a été envoyé à +%(msisdn)s. Saisissez le code de vérification qu’il contient.",
     "Command Help": "Aide aux commandes",
     "No identity server is configured: add one in server settings to reset your password.": "Aucun serveur d’identité n’est configuré : ajoutez-en un dans les paramètres du serveur pour réinitialiser votre mot de passe.",
     "Identity Server URL must be HTTPS": "L’URL du serveur d’identité doit être en HTTPS",
     "Not a valid Identity Server (status code %(code)s)": "Serveur d’identité non valide (code de statut %(code)s)",
     "Could not connect to Identity Server": "Impossible de se connecter au serveur d’identité",
     "Checking server": "Vérification du serveur",
-    "Disconnect from the identity server <idserver />?": "Se déconnecter du serveur d’identité <idserver /> ?",
+    "Disconnect from the identity server <idserver />?": "Se déconnecter du serveur d’identité <idserver /> ?",
     "Disconnect": "Se déconnecter",
     "Identity Server (%(server)s)": "Serveur d’identité (%(server)s)",
     "You are currently using <server></server> to discover and be discoverable by existing contacts you know. You can change your identity server below.": "Vous utilisez actuellement <server></server> pour découvrir et être découvert par des contacts existants que vous connaissez. Vous pouvez changer votre serveur d’identité ci-dessous.",
@@ -1487,9 +1487,9 @@
     "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "Nous recommandons que vous supprimiez vos adresses e-mail et vos numéros de téléphone du serveur d’identité avant de vous déconnecter.",
     "Disconnect anyway": "Se déconnecter quand même",
     "Error changing power level requirement": "Erreur de changement du critère de rang",
-    "An error occurred changing the room's power level requirements. Ensure you have sufficient permissions and try again.": "Une erreur est survenue lors de la modification des critères de rang du salon. Vérifiez que vous avez les bonnes permissions et réessayez.",
+    "An error occurred changing the room's power level requirements. Ensure you have sufficient permissions and try again.": "Une erreur est survenue lors de la modification des critères de rang du salon. Vérifiez que vous avez les permissions nécessaires et réessayez.",
     "No recent messages by %(user)s found": "Aucun message récent de %(user)s n’a été trouvé",
-    "Try scrolling up in the timeline to see if there are any earlier ones.": "Essayez de faire défiler l’historique vers le haut pour voir s’il y en a de plus anciens.",
+    "Try scrolling up in the timeline to see if there are any earlier ones.": "Essayez de faire défiler le fil de discussion vers le haut pour voir s’il y en a de plus anciens.",
     "Remove recent messages by %(user)s": "Supprimer les messages récents de %(user)s",
     "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|other": "Vous êtes sur le point de supprimer %(count)s messages de %(user)s. Ça ne peut pas être annulé. Voulez-vous continuer ?",
     "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "Pour un grand nombre de messages, cela peut prendre du temps. N’actualisez pas votre client pendant ce temps.",
@@ -1557,11 +1557,11 @@
     "DuckDuckGo Results": "Résultats de DuckDuckGo",
     "Quick Reactions": "Réactions rapides",
     "Frequently Used": "Utilisé fréquemment",
-    "Smileys & People": "Émoticônes & personnes",
-    "Animals & Nature": "Animaux & nature",
-    "Food & Drink": "Nourriture & boisson",
+    "Smileys & People": "Visages et personnes",
+    "Animals & Nature": "Animaux et nature",
+    "Food & Drink": "Nourriture et boisson",
     "Activities": "Activités",
-    "Travel & Places": "Voyage & lieux",
+    "Travel & Places": "Voyages et lieux",
     "Objects": "Objets",
     "Symbols": "Symboles",
     "Flags": "Drapeaux",
@@ -1608,10 +1608,10 @@
     "User rules": "Règles d’utilisateur",
     "You have not ignored anyone.": "Vous n’avez ignoré personne.",
     "You are currently ignoring:": "Vous ignorez actuellement :",
-    "You are not subscribed to any lists": "Vous n’êtes inscrit(e) à aucune liste",
+    "You are not subscribed to any lists": "Vous n’êtes inscrit à aucune liste",
     "Unsubscribe": "Se désinscrire",
     "View rules": "Voir les règles",
-    "You are currently subscribed to:": "Vous êtes actuellement inscrit(e) à :",
+    "You are currently subscribed to:": "Vous êtes actuellement inscrit à :",
     "⚠ These settings are meant for advanced users.": "⚠ Ces paramètres sont prévus pour les utilisateurs avancé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.": "Ignorer les gens est possible grâce à des listes de bannissement qui contiennent des règles sur les personnes à bannir. L’inscription à une liste de bannissement signifie que les utilisateurs/serveurs bloqués par cette liste seront cachés pour vous.",
     "Personal ban list": "Liste de bannissement personnelle",
@@ -1646,8 +1646,8 @@
     "Connecting to integration manager...": "Connexion au gestionnaire d’intégrations…",
     "Cannot connect to integration manager": "Impossible de se connecter au gestionnaire d’intégrations",
     "The integration manager is offline or it cannot reach your homeserver.": "Le gestionnaire d’intégrations est hors ligne ou il ne peut pas joindre votre serveur d’accueil.",
-    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Utilisez un gestionnaire d’intégrations <b>(%(serverName)s)</b> pour gérer les bots, les widgets et les packs de stickers.",
-    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Utilisez un gestionnaire d’intégrations pour gérer les bots, les widgets et les packs de stickers.",
+    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Utilisez un gestionnaire d’intégrations <b>(%(serverName)s)</b> pour gérer les robots, les widgets et les jeux d’autocollants.",
+    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Utilisez un gestionnaire d’intégrations pour gérer les robots, les widgets et les jeux d’autocollants.",
     "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Les gestionnaires d’intégrations reçoivent les données de configuration et peuvent modifier les widgets, envoyer des invitations aux salons et définir les rangs à votre place.",
     "Failed to connect to integration manager": "Échec de la connexion au gestionnaire d’intégrations",
     "Widgets do not use message encryption.": "Les widgets n’utilisent pas le chiffrement des messages.",
@@ -1664,8 +1664,8 @@
     "Manage integrations": "Gérer les intégrations",
     "Verification Request": "Demande de vérification",
     "Match system theme": "S’adapter au thème du système",
-    "%(senderName)s placed a voice call.": "%(senderName)s a passé un appel vocal.",
-    "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s a passé un appel vocal. (non pris en charge par ce navigateur)",
+    "%(senderName)s placed a voice call.": "%(senderName)s a passé un appel audio.",
+    "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s a passé un appel audio. (non pris en charge par ce navigateur)",
     "%(senderName)s placed a video call.": "%(senderName)s a passé un appel vidéo.",
     "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s a passé un appel vidéo. (non pris en charge par ce navigateur)",
     "Clear notifications": "Vider les notifications",
@@ -1731,7 +1731,7 @@
     "Close preview": "Fermer l’aperçu",
     "Language Dropdown": "Sélection de la langue",
     "Country Dropdown": "Sélection du pays",
-    "The message you are trying to send is too large.": "Le message que vous essayez d’envoyer est trop gros.",
+    "The message you are trying to send is too large.": "Le message que vous essayez d’envoyer est trop grand.",
     "Help": "Aide",
     "Show more": "En voir plus",
     "Recent Conversations": "Conversations récentes",
@@ -1759,9 +1759,9 @@
     "about a day from now": "dans un jour environ",
     "%(num)s days from now": "dans %(num)s jours",
     "Failed to invite the following users to chat: %(csvUsers)s": "Échec de l’invitation des utilisateurs suivants à discuter : %(csvUsers)s",
-    "We couldn't create your DM. Please check the users you want to invite and try again.": "Impossible de créer votre message direct. Vérifiez les utilisateurs que vous souhaitez inviter et réessayez.",
+    "We couldn't create your DM. Please check the users you want to invite and try again.": "Impossible de créer votre conversation privée. Vérifiez quels utilisateurs que vous souhaitez inviter et réessayez.",
     "Something went wrong trying to invite the users.": "Une erreur est survenue en essayant d’inviter les utilisateurs.",
-    "We couldn't invite those users. Please check the users you want to invite and try again.": "Impossible d’inviter ces utilisateurs. Vérifiez les utilisateurs que vous souhaitez inviter et réessayez.",
+    "We couldn't invite those users. Please check the users you want to invite and try again.": "Impossible d’inviter ces utilisateurs. Vérifiez quels utilisateurs que vous souhaitez inviter et réessayez.",
     "Recently Direct Messaged": "Messages directs récents",
     "Start": "Commencer",
     "Session verified": "Session vérifiée",
@@ -1805,7 +1805,7 @@
     "%(brand)s is securely caching encrypted messages locally for them to appear in search results:": "%(brand)s met en cache les messages chiffrés localement et de manière sécurisée pour qu’ils apparaissent dans les résultats de recherche :",
     "Space used:": "Espace utilisé :",
     "Indexed messages:": "Messages indexés :",
-    "Waiting for %(displayName)s to verify…": "Nous attendons que %(displayName)s vérifie…",
+    "Waiting for %(displayName)s to verify…": "En attente de la vérification de %(displayName)s…",
     "They match": "Ils correspondent",
     "They don't match": "Ils ne correspondent pas",
     "This bridge was provisioned by <user />.": "Cette passerelle a été fournie par <user />.",
@@ -1815,7 +1815,7 @@
     "This room is bridging messages to the following platforms. <a>Learn more.</a>": "Ce salon transmet les messages vers les plateformes suivantes. <a>En savoir plus.</a>",
     "This room isn’t bridging messages to any platforms. <a>Learn more.</a>": "Ce salon ne transmet les messages à aucune plateforme. <a>En savoir plus.</a>",
     "Bridges": "Passerelles",
-    "Waiting for %(displayName)s to accept…": "Nous attendons que %(displayName)s accepte…",
+    "Waiting for %(displayName)s to accept…": "En attente d’acceptation par %(displayName)s…",
     "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Vos messages sont sécurisés et seuls vous et le destinataire avez les clés uniques pour les déchiffrer.",
     "Your messages are not secure": "Vos messages ne sont pas sécurisés",
     "One of the following may be compromised:": "Un des éléments suivants est peut-être compromis :",
@@ -1843,8 +1843,8 @@
     "Never send encrypted messages to unverified sessions from this session": "Ne jamais envoyer de messages chiffrés aux sessions non vérifiées depuis cette session",
     "Never send encrypted messages to unverified sessions in this room from this session": "Ne jamais envoyer des messages chiffrés aux sessions non vérifiées dans ce salon depuis cette session",
     "To be secure, do this in person or use a trusted way to communicate.": "Pour être sûr, faites cela en personne ou utilisez un moyen de communication fiable.",
-    "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Changer votre mot de passe réinitialisera toutes les clés de chiffrement sur toutes les sessions, ce qui rendra l’historique de vos messages illisible, sauf si vous exportez d’abord vos clés de chiffrement et si vous les réimportez ensuite. Dans l’avenir, ce processus sera amélioré.",
-    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Votre compte à une identité de signature croisée dans le coffre secret, mais cette session ne lui fait pas encore confiance.",
+    "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Changer votre mot de passe réinitialisera toutes les clés de chiffrement sur toutes les sessions, ce qui rendra l’historique de vos messages illisible, sauf si vous exportez d’abord vos clés de chiffrement et si vous les réimportez ensuite. À l’avenir, ce processus sera amélioré.",
+    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Votre compte a une identité de signature croisée dans le coffre secret, mais cette session ne lui fait pas encore confiance.",
     "in memory": "en mémoire",
     "Your homeserver does not support session management.": "Votre serveur d’accueil ne prend pas en charge la gestion de session.",
     "Unable to load session list": "Impossible de charger la liste de sessions",
@@ -1872,7 +1872,7 @@
     "A session's public name is visible to people you communicate with": "Le nom public d’une session est visible par les personnes avec lesquelles vous communiquez",
     "This user has not verified all of their sessions.": "Cet utilisateur n’a pas vérifié toutes ses sessions.",
     "You have verified this user. This user has verified all of their sessions.": "Vous avez vérifié cet utilisateur. Cet utilisateur a vérifié toutes ses sessions.",
-    "Someone is using an unknown session": "Quelqu'un utilise une session inconnue",
+    "Someone is using an unknown session": "Quelqu’un utilise une session inconnue",
     "Mod": "Modo",
     "Your key share request has been sent - please check your other sessions for key share requests.": "Votre demande de partage de clé a été envoyée − vérifiez les demandes de partage de clé sur vos autres sessions.",
     "Key share requests are sent to your other sessions automatically. If you rejected or dismissed the key share request on your other sessions, click here to request the keys for this session again.": "Les demandes de partage de clé sont envoyées à vos autres sessions automatiquement. Si vous avez rejeté ou ignoré la demande de partage de clé sur vos autres sessions, cliquez ici pour redemander les clés pour cette session.",
@@ -1894,7 +1894,7 @@
     "Session name": "Nom de la session",
     "Session key": "Clé de la session",
     "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Vérifier cet utilisateur marquera sa session comme fiable, et marquera aussi votre session comme fiable pour lui.",
-    "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.": "Vérifier cet appareil le marquera comme fiable. Faire confiance à cette appareil vous permettra à vous et aux autres utilisateurs d’être sereins lors de l’utilisation de messages chiffrés.",
+    "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.": "Vérifier cet appareil le marquera comme fiable. Faire confiance à cette appareil vous permettra à vous et aux autres utilisateurs d’être tranquilles lors de l’utilisation de messages chiffrés.",
     "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Vérifier cet appareil le marquera comme fiable, et les utilisateurs qui ont vérifié avec vous feront confiance à cet appareil.",
     "This will allow you to return to your account after signing out, and sign in on other sessions.": "Cela vous permettra de revenir sur votre compte après vous être déconnecté, et de vous connecter sur d’autres sessions.",
     "Without completing security on this session, it won’t have access to encrypted messages.": "Sans compléter la sécurité sur cette session, elle n’aura pas accès aux messages chiffrés.",
@@ -1954,10 +1954,10 @@
     "Accepting…": "Acceptation…",
     "Accepting …": "Acceptation…",
     "Declining …": "Refus…",
-    "Your account is not secure": "Votre compte n'est pas sécurisé",
+    "Your account is not secure": "Votre compte n’est pas sûr",
     "Your password": "Votre mot de passe",
-    "This session, or the other session": "Cette session, ou l'autre session",
-    "The internet connection either session is using": "La connection internet de l'une des sessions",
+    "This session, or the other session": "Cette session, ou l’autre session",
+    "The internet connection either session is using": "La connexion internet de l’une des sessions",
     "We recommend you change your password and recovery key in Settings immediately": "Nous vous recommandons de changer votre mot de passe et la clé de récupération dans Paramètres dès que possible",
     "Sign In or Create Account": "Se connecter ou créer un compte",
     "Use your account or create a new one to continue.": "Utilisez votre compte ou créez en un pour continuer.",
@@ -1981,7 +1981,7 @@
     "%(senderName)s changed the addresses for this room.": "%(senderName)s a changé les adresses de ce salon.",
     "Support adding custom themes": "Autoriser l’ajout de thèmes personnalisés",
     "Invalid theme schema.": "Schéma du thème invalide.",
-    "Error downloading theme information.": "Une erreur s'est produite en téléchargeant les informations du thème.",
+    "Error downloading theme information.": "Une erreur s’est produite en téléchargeant les informations du thème.",
     "Theme added!": "Thème ajouté !",
     "Custom theme URL": "URL personnalisée pour le thème",
     "Add theme": "Ajouter le thème",
@@ -1989,7 +1989,7 @@
     "Local address": "Adresse locale",
     "Published Addresses": "Adresses publiées",
     "Published addresses can be used by anyone on any server to join your room. To publish an address, it needs to be set as a local address first.": "Les adresses publiées peuvent être utilisées par n’importe qui sur n’importe quel serveur pour rejoindre votre salon. Pour publier une adresse, elle doit d’abord être définie comme adresse locale.",
-    "Other published addresses:": "Autres adresses publiques :",
+    "Other published addresses:": "Autres adresses publiées :",
     "No other published addresses yet, add one below": "Aucune autre adresse n’est publiée, ajoutez-en une ci-dessous",
     "New published address (e.g. #alias:server)": "Nouvelles adresses publiées (par ex. #alias:serveur)",
     "Local Addresses": "Adresses locales",
@@ -2032,9 +2032,9 @@
     "Toggle Italics": "(Dés)activer l’italique",
     "Toggle Quote": "(Dés)activer la citation",
     "New line": "Nouvelle ligne",
-    "Navigate recent messages to edit": "Parcourir les messages récents pour éditer",
+    "Navigate recent messages to edit": "Parcourir les messages récents pour modifier",
     "Jump to start/end of the composer": "Sauter au début/à la fin du compositeur",
-    "Toggle microphone mute": "(Dés)activer la sourdine du micro",
+    "Toggle microphone mute": "Activer/désactiver le micro",
     "Toggle video on/off": "Dés(activer) la vidéo",
     "Jump to room search": "Sauter à la recherche de salon",
     "Navigate up/down in the room list": "Parcourir avec haut/bas dans la liste des salons",
@@ -2042,7 +2042,7 @@
     "Collapse room list section": "Réduire la section de la liste des salons",
     "Expand room list section": "Développer la section de la liste des salons",
     "Clear room list filter field": "Effacer le champ de filtrage de la liste des salons",
-    "Scroll up/down in the timeline": "Défiler vers le haut/le bas dans l’historique",
+    "Scroll up/down in the timeline": "Défiler vers le haut/le bas dans le fil de discussion",
     "Toggle the top left menu": "Afficher/masquer le menu en haut à gauche",
     "Close dialog or context menu": "Fermer le dialogue ou le menu contextuel",
     "Activate selected button": "Activer le bouton sélectionné",
@@ -2061,8 +2061,8 @@
     "Confirm this user's session by comparing the following with their User Settings:": "Confirmez la session de cet utilisateur en comparant ceci avec ses paramètres utilisateur :",
     "If they don't match, the security of your communication may be compromised.": "S’ils ne correspondent pas, la sécurité de vos communications est peut-être compromise.",
     "Navigate composer history": "Explorer l’historique du compositeur",
-    "Previous/next unread room or DM": "Salon ou message direct non lu précédent/suivant",
-    "Previous/next room or DM": "Salon ou message direct précédent/suivant",
+    "Previous/next unread room or DM": "Salon ou conversation privée non lu précédent/suivant",
+    "Previous/next room or DM": "Salon ou conversation privée précédent/suivant",
     "Toggle right panel": "Afficher/masquer le panneau de droite",
     "Manually verify all remote sessions": "Vérifier manuellement toutes les sessions à distance",
     "Self signing private key:": "Clé privée d’auto-signature :",
@@ -2094,7 +2094,7 @@
     "Delete sessions": "Supprimer les sessions",
     "Confirm the emoji below are displayed on both sessions, in the same order:": "Confirmez que les émojis ci-dessous s’affichent dans les deux sessions et dans le même ordre :",
     "Verify this session by confirming the following number appears on its screen.": "Vérifiez cette session en confirmant que le nombre suivant s’affiche sur son écran.",
-    "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Dans l’attente que votre autre session, %(deviceName)s (%(deviceId)s), vérifie…",
+    "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "En attente de la vérification depuis votre autre session, %(deviceName)s (%(deviceId)s)…",
     "From %(deviceName)s (%(deviceId)s)": "Depuis %(deviceName)s (%(deviceId)s)",
     "Waiting for you to accept on your other session…": "Dans l’attente que vous acceptiez dans votre autre session…",
     "Almost there! Is your other session showing the same shield?": "On y est presque ! Est-ce que votre autre session affiche le même bouclier ?",
@@ -2128,7 +2128,7 @@
     "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 robots 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",
@@ -2151,7 +2151,7 @@
     "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.",
+    "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 aléatoire.",
     "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",
@@ -2164,15 +2164,15 @@
     "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é",
-    "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",
+    "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 ne sont pas compromis",
     "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",
-    "You signed in to a new session without verifying it:": "Vous vous êtes connecté·e à une nouvelle session sans la vérifier :",
+    "You signed in to a new session without verifying it:": "Vous vous êtes connecté à 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>.",
     "Message deleted": "Message supprimé",
@@ -2188,9 +2188,9 @@
     "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",
+    "Jump to oldest unread message": "Aller au plus ancien message non lu",
     "Upload a file": "Envoyer un fichier",
-    "IRC display name width": "Largeur du nom affiché IRC",
+    "IRC display name width": "Largeur du nom d’affichage IRC",
     "Create room": "Créer un salon",
     "Font scaling": "Mise à l’échelle de la police",
     "Font size": "Taille de la police",
@@ -2239,7 +2239,7 @@
     "Switch to light mode": "Passer au mode clair",
     "Switch to dark mode": "Passer au mode sombre",
     "Switch theme": "Changer le thème",
-    "Security & privacy": "Sécurité & vie privée",
+    "Security & privacy": "Sécurité et vie privée",
     "All settings": "Tous les paramètres",
     "Feedback": "Commentaire",
     "No recently visited rooms": "Aucun salon visité récemment",
@@ -2278,8 +2278,8 @@
     "You left the call": "Vous avez quitté l’appel",
     "%(senderName)s left the call": "%(senderName)s a quitté l’appel",
     "Call ended": "Appel terminé",
-    "You started a call": "Vous avez démarré un appel",
-    "%(senderName)s started a call": "%(senderName)s a démarré un appel",
+    "You started a call": "Vous avez commencé un appel",
+    "%(senderName)s started a call": "%(senderName)s a commencé un appel",
     "Waiting for answer": "En attente d’une réponse",
     "%(senderName)s is calling": "%(senderName)s appelle",
     "You created the room": "Vous avez créé le salon",
@@ -2337,10 +2337,10 @@
     "Use your Security Key to continue.": "Utilisez votre clé de sécurité pour continuer.",
     "Safeguard against losing access to encrypted messages & data by backing up encryption keys on your server.": "Protection afin d’éviter de perdre l’accès aux messages et données chiffrés en sauvegardant les clés de chiffrement sur votre serveur.",
     "Generate a Security Key": "Générer une clé de sécurité",
-    "We’ll generate a Security Key for you to store somewhere safe, like a password manager or a safe.": "Nous génèrerons une clé de sécurité que vous devrez stocker dans un endroit sûr, comme un gestionnaire de mots de passe ou un coffre.",
+    "We’ll generate a Security Key for you to store somewhere safe, like a password manager or a safe.": "Nous générerons une clé de sécurité que vous devrez stocker dans un endroit sûr, comme un gestionnaire de mots de passe ou un coffre.",
     "Enter a Security Phrase": "Saisir une phrase de sécurité",
-    "Use a secret phrase only you know, and optionally save a Security Key to use for backup.": "Utilisez une phrase secrète que vous êtes seul·e à connaître et enregistrez éventuellement une clé de sécurité à utiliser pour la sauvegarde.",
-    "Enter a security phrase only you know, as it’s used to safeguard your data. To be secure, you shouldn’t re-use your account password.": "Saisissez une phrase de sécurité que vous seul·e connaissez, car elle est utilisée pour protéger vos données. Pour plus de sécurité, vous ne devriez pas réutiliser le mot de passe de votre compte.",
+    "Use a secret phrase only you know, and optionally save a Security Key to use for backup.": "Utilisez une phrase secrète que vous êtes seul à connaître et enregistrez éventuellement une clé de sécurité à utiliser pour la sauvegarde.",
+    "Enter a security phrase only you know, as it’s used to safeguard your data. To be secure, you shouldn’t re-use your account password.": "Saisissez une phrase de sécurité que vous seul connaissez, car elle est utilisée pour protéger vos données. Pour plus de sécurité, vous ne devriez pas réutiliser le mot de passe de votre compte.",
     "Store your Security Key somewhere safe, like a password manager or a safe, as it’s used to safeguard your encrypted data.": "Stockez votre clé de sécurité dans un endroit sûr, comme un gestionnaire de mots de passe ou un coffre, car elle est utilisée pour protéger vos données chiffrées.",
     "If you cancel now, you may lose encrypted messages & data if you lose access to your logins.": "Si vous annulez maintenant, vous pourriez perdre vos messages et données chiffrés si vous perdez l’accès à vos identifiants.",
     "You can also set up Secure Backup & manage your keys in Settings.": "Vous pouvez aussi configurer la sauvegarde sécurisée et gérer vos clés depuis les paramètres.",
@@ -2353,7 +2353,7 @@
     "Riot is now Element!": "Riot est maintenant Element !",
     "Learn More": "Plus d'infos",
     "Enable experimental, compact IRC style layout": "Disposition expérimentale compacte style IRC",
-    "Incoming voice call": "Appel vocal entrant",
+    "Incoming voice call": "Appel audio entrant",
     "Incoming video call": "Appel vidéo entrant",
     "Incoming call": "Appel entrant",
     "Make this room low priority": "Définir ce salon en priorité basse",
@@ -2367,13 +2367,13 @@
     "Favourited": "Favori",
     "Forget Room": "Oublier le salon",
     "This room is public": "Ce salon est public",
-    "Edited at %(date)s": "Édité le %(date)s",
-    "Click to view edits": "Cliquez pour éditer",
+    "Edited at %(date)s": "Modifié le %(date)s",
+    "Click to view edits": "Cliquez pour voir les modifications",
     "Go to Element": "Aller à Element",
     "We’re excited to announce Riot is now Element!": "Nous sommes heureux d'annoncer que Riot est désormais Element !",
     "Learn more at <a>element.io/previously-riot</a>": "Plus d'infos sur <a>element.io/previously-riot</a>",
     "Search rooms": "Chercher des salons",
-    "User menu": "Menu d'utilisateur",
+    "User menu": "Menu d’utilisateur",
     "%(brand)s Web": "%(brand)s Web",
     "%(brand)s Desktop": "%(brand)s Desktop",
     "%(brand)s iOS": "%(brand)s iOS",
@@ -2385,20 +2385,20 @@
     "The person who invited you already left the room, or their server is offline.": "La personne vous ayant invité a déjà quitté le salon, ou son serveur est hors-ligne.",
     "* %(senderName)s %(emote)s": "* %(senderName)s %(emote)s",
     "Change notification settings": "Modifier les paramètres de notification",
-    "Show message previews for reactions in DMs": "Afficher la prévisualisation des messages pour les réactions dans les messages privés",
+    "Show message previews for reactions in DMs": "Afficher l’aperçu des messages pour les réactions dans les conversations privées",
     "Show message previews for reactions in all rooms": "Afficher la prévisualisation des messages pour les réactions dans tous les salons",
     "Enable advanced debugging for the room list": "Activer le débogage avancé pour la liste de salons",
-    "Uploading logs": "Téléversement des journaux",
+    "Uploading logs": "Envoi des journaux",
     "Downloading logs": "Téléchargement des journaux",
     "Your server isn't responding to some <a>requests</a>.": "Votre serveur ne répond pas à certaines <a>requêtes</a>.",
     "Cross-signing and secret storage are ready for use.": "La signature croisée et le coffre secret sont prêt à l'emploi.",
     "Cross-signing is ready for use, but secret storage is currently not being used to backup your keys.": "La signature croisée est prête à l'emploi, mais le coffre secret n'est pas actuellement utilisé pour sauvegarder vos clés.",
-    "Master private key:": "Clé privée maîtresse :",
+    "Master private key:": "Clé privée maîtresse :",
     "%(brand)s can't securely cache encrypted messages locally while running in a web browser. Use <desktopLink>%(brand)s Desktop</desktopLink> for encrypted messages to appear in search results.": "%(brand)s ne peut actuellement mettre en cache vos messages chiffrés localement de manière sécurisée via le navigateur Web. Utilisez <desktopLink>%(brand)s Desktop</desktopLink> pour que les messages chiffrés apparaissent dans vos résultats de recherche.",
     "There are advanced notifications which are not shown here.": "Des notifications avancées ne sont pas affichées ici.",
     "ready": "prêt",
-    "The operation could not be completed": "L'opération n'a pas pu être terminée",
-    "Failed to save your profile": "Erreur lors de l'enregistrement du profile",
+    "The operation could not be completed": "L’opération n’a pas pu être terminée",
+    "Failed to save your profile": "Erreur lors de l’enregistrement du profil",
     "Unknown App": "Application inconnue",
     "%(senderName)s declined the call.": "%(senderName)s a refusé l’appel.",
     "(an error occurred)": "(une erreur est survenue)",
@@ -2408,39 +2408,39 @@
     "Prepends ( ͡° ͜ʖ ͡°) to a plain-text message": "Ajoute ( ͡° ͜ʖ ͡°) en préfixe du message",
     "This will end the conference for everyone. Continue?": "Ceci arrêtera la téléconférence pour tout le monde. Continuer ?",
     "End conference": "Finir la téléconférence",
-    "The call was answered on another device.": "L’appel a été répondu sur un autre appareil.",
+    "The call was answered on another device.": "L’appel a été décroché sur un autre appareil.",
     "Answered Elsewhere": "Répondu autre-part",
     "The call could not be established": "L’appel n’a pas pu être établi",
     "The other party declined the call.": "Le correspondant a décliné l’appel.",
     "Call Declined": "Appel rejeté",
     "Ignored attempt to disable encryption": "Essai de désactiver le chiffrement ignoré",
-    "Add users and servers you want to ignore here. Use asterisks to have %(brand)s match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.": "Ajoutez les utilisateurs et les serveurs que vous voulez ignorer ici. Utilisez des astérisques pour que %(brand)s comprenne tous les caractères. Par exemple, <code>@bot:*</code> va ignorer tous les utilisateurs ayant le nom 'bot' sur n'importe quel serveur.",
+    "Add users and servers you want to ignore here. Use asterisks to have %(brand)s match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.": "Ajoutez les utilisateurs et les serveurs que vous voulez ignorer ici. Utilisez des astérisques pour que %(brand)s comprenne tous les caractères. Par exemple, <code>@bot:*</code> va ignorer tous les utilisateurs ayant le nom « bot » sur n’importe quel serveur.",
     "not ready": "pas prêt",
-    "Secret storage:": "Coffre secret :",
-    "Backup key cached:": "Clé de sauvegarde mise en cache :",
-    "Backup key stored:": "Clé de sauvegarde enregistrée :",
+    "Secret storage:": "Coffre secret :",
+    "Backup key cached:": "Clé de sauvegarde mise en cache :",
+    "Backup key stored:": "Clé de sauvegarde enregistrée :",
     "Back up your encryption keys with your account data in case you lose access to your sessions. Your keys will be secured with a unique Recovery Key.": "Sauvegarder vos clés de chiffrement avec les données de votre compte dans le cas où vous perdez l'accès à vos sessions. Vos clés seront sécurisées grâce à une unique clé de récupération.",
-    "Backup version:": "Version de la sauvegarde :",
-    "You might have configured them in a client other than %(brand)s. You cannot tune them in %(brand)s but they still apply.": "Vous les avez peut-être configurés dans un autre client que %(brand)s. Vous ne pouvez pas les configurer dans %(brand)s mais ils s'appliquent quand même.",
+    "Backup version:": "Version de la sauvegarde :",
+    "You might have configured them in a client other than %(brand)s. You cannot tune them in %(brand)s but they still apply.": "Vous les avez peut-être configurés dans un autre client que %(brand)s. Vous ne pouvez pas les configurer dans %(brand)s mais ils s’appliquent quand même.",
     "not found in storage": "non trouvé dans le coffre",
-    "Cross-signing is not set up.": "La signature croisée n'est pas configurée.",
+    "Cross-signing is not set up.": "La signature croisée n’est pas configurée.",
     "Cross-signing is ready for use.": "La signature croisée est prête à être utilisée.",
     "Offline encrypted messaging using dehydrated devices": "Messagerie hors-ligne chiffrée utilisant des appareils déshydratés",
-    "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.": "Prototype de communautés v2. Requiert un serveur d'accueil compatible. Très expérimental - à utiliser avec précaution.",
-    "Safeguard against losing access to encrypted messages & data": "Sécurité contre la perte d'accès aux messages & données chiffrées",
+    "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.": "Prototype de communautés v2. Requiert un serveur d’accueil compatible. Très expérimental - à utiliser avec précaution.",
+    "Safeguard against losing access to encrypted messages & data": "Sécurité contre la perte d’accès aux messages et données chiffrées",
     "(their device couldn't start the camera / microphone)": "(leur appareil ne peut pas démarrer la caméra/le microphone)",
     "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 Tous les serveurs ont été bannis ! Ce salon ne peut plus être utilisé.",
     "What's the name of your community or team?": "Quel est le nom de votre communauté ou équipe ?",
     "You can change this later if needed.": "Vous pouvez modifier ceci après si besoin.",
-    "Use this when referencing your community to others. The community ID cannot be changed.": "Utilisez ceci lorsque vous faites référence à votre communauté aux autres. L'identifiant de la communauté ne peut pas être modifié.",
+    "Use this when referencing your community to others. The community ID cannot be changed.": "Utilisez ceci lorsque vous faites référence à votre communauté aux autres. L’identifiant de la communauté ne peut pas être modifié.",
     "There was an error creating your community. The name may be taken or the server is unable to process your request.": "Une erreur est survenue lors de la création de votre communauté. Le nom est peut-être pris ou le serveur ne peut pas exécuter votre requête.",
     "This version of %(brand)s does not support searching encrypted messages": "Cette version de %(brand)s ne prend pas en charge la recherche dans les messages chiffrés",
-    "This version of %(brand)s does not support viewing some encrypted files": "Cette version de %(brand)s ne prend pas en charge l'affichage de certains fichiers chiffrés",
+    "This version of %(brand)s does not support viewing some encrypted files": "Cette version de %(brand)s ne prend pas en charge l’affichage de certains fichiers chiffrés",
     "Use the <a>Desktop app</a> to search encrypted messages": "Utilisez une <a>Application de bureau</a> pour rechercher dans tous les messages chiffrés",
     "Use the <a>Desktop app</a> to see all encrypted files": "Utilisez une <a>Application de bureau</a> pour voir tous les fichiers chiffrés",
     "Join the conference at the top of this room": "Rejoignez la téléconférence en haut de ce salon",
-    "Join the conference from the room information card on the right": "Rejoignez la téléconférence à partir de la carte d'informations sur la droite",
-    "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "Définissez le nom d'une police de caractères installée sur votre système et %(brand)s essaiera de l'utiliser.",
+    "Join the conference from the room information card on the right": "Rejoignez la téléconférence à partir de la carte d’informations sur la droite",
+    "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "Définissez le nom d’une police de caractères installée sur votre système et %(brand)s essaiera de l’utiliser.",
     "Create a room in %(communityName)s": "Créer un salon dans %(communityName)s",
     "An image will help people identify your community.": "Une image aidera les personnes à identifier votre communauté.",
     "Add image (optional)": "Ajouter une image (facultatif)",
@@ -2463,32 +2463,32 @@
     "%(count)s people|one": "%(count)s personne",
     "About": "À propos",
     "Not encrypted": "Non-chiffré",
-    "Add widgets, bridges & bots": "Ajouter des widgets, ponts et bots",
-    "Edit widgets, bridges & bots": "Modifier les widgets, ponts et bots",
+    "Add widgets, bridges & bots": "Ajouter des widgets, passerelles et robots",
+    "Edit widgets, bridges & bots": "Modifier les widgets, passerelles et robots",
     "Widgets": "Widgets",
-    "Unpin a widget to view it in this panel": "Dépingler un widget pour l'afficher dans ce panneau",
+    "Unpin a widget to view it in this panel": "Dépingler un widget pour l’afficher dans ce panneau",
     "Unpin": "Dépingler",
-    "You can only pin up to %(count)s widgets|other": "Vous ne pouvez épingler que jusqu'à %(count)s widgets",
+    "You can only pin up to %(count)s widgets|other": "Vous ne pouvez épingler que jusqu’à %(count)s widgets",
     "Room Info": "Informations sur le salon",
     "%(count)s results|one": "%(count)s résultat",
     "%(count)s results|other": "%(count)s résultats",
-    "Explore all public rooms": "Explorer tous les salons publiques",
-    "Can't see what you’re looking for?": "Vous ne voyez pas ce que vous cherchez ?",
+    "Explore all public rooms": "Explorer tous les salons publics",
+    "Can't see what you’re looking for?": "Vous ne trouvez pas ce que vous cherchez ?",
     "Custom Tag": "Étiquette personnalisée",
-    "Explore public rooms": "Explorer les salons publiques",
+    "Explore public rooms": "Explorer les salons publics",
     "Explore community rooms": "Explorer les salons de la communauté",
     "Show Widgets": "Afficher les widgets",
     "Hide Widgets": "Masquer les widgets",
-    "Remove messages sent by others": "Supprimer les messages envoyés par d'autres",
+    "Remove messages sent by others": "Supprimer les messages envoyés par d’autres",
     "Privacy": "Vie privée",
     "Secure Backup": "Sauvegarde sécurisée",
     "Algorithm:": "Algorithme :",
     "Set up Secure Backup": "Configurer la sauvegarde sécurisée",
     "%(brand)s Android": "%(brand)s Android",
-    "Community and user menu": "Menu de la communauté et de l'utilisateur",
-    "User settings": "Paramètres de l'utilisateur",
+    "Community and user menu": "Menu de la communauté et de l’utilisateur",
+    "User settings": "Paramètres de l’utilisateur",
     "Community settings": "Paramètres de la communauté",
-    "Failed to find the general chat for this community": "Impossible de trouver le chat général de cette communauté",
+    "Failed to find the general chat for this community": "Impossible de trouver la discussion générale de cette communauté",
     "Starting microphone...": "Allumage du microphone …",
     "Starting camera...": "Allumage de la caméra ...",
     "Call connecting...": "Connexion à l'appel …",
@@ -2496,10 +2496,10 @@
     "Explore rooms in %(communityName)s": "Explorer les salons dans %(communityName)s",
     "You have no visible notifications in this room.": "Vous n'avez pas de notification visible dans ce salon.",
     "You’re all caught up": "Vous êtes à jour",
-    "You do not have permission to create rooms in this community.": "Vous n'avez pas la permission de créer des salons dans cette communauté.",
+    "You do not have permission to create rooms in this community.": "Vous n’avez pas la permission de créer des salons dans cette communauté.",
     "Cannot create rooms in this community": "Impossible de créer des salons dans cette communauté",
     "Create community": "Créer une communauté",
-    "Attach files from chat or just drag and drop them anywhere in a room.": "Envoyez des fichiers depuis le chat ou juste glissez et déposez-les n'importe où dans le salon.",
+    "Attach files from chat or just drag and drop them anywhere in a room.": "Envoyez des fichiers depuis la discussion ou glissez et déposez-les n’importe où dans le salon.",
     "No files visible in this room": "Aucun fichier visible dans ce salon",
     "Enter the location of your Element Matrix Services homeserver. It may use your own domain name or be a subdomain of <a>element.io</a>.": "Entrez l'emplacement de votre serveur d'accueil Element Matrix Services. Cela peut utiliser votre propre nom de domaine ou être un sous-domaine de <a>element.io</a>.",
     "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use %(brand)s with an existing Matrix account on a different homeserver.": "Vous pouvez utiliser l'option de serveur personnalisé pour vous connecter à d'autres serveurs Matrix en spécifiant une URL de serveur d'accueil différente. Cela vous permet d'utiliser %(brand)s avec un compte Matrix existant sur un serveur d'accueil différent.",
@@ -2509,61 +2509,61 @@
     "Revoke permissions": "Révoquer les permissions",
     "Take a picture": "Prendre une photo",
     "Unable to set up keys": "Impossible de configurer les clés",
-    "Recent changes that have not yet been received": "Changements récents qui n'ont pas encore été reçus",
-    "The server is not configured to indicate what the problem is (CORS).": "Le n'est n'est pas configuré pour indiquer quel est le problème (CORS).",
+    "Recent changes that have not yet been received": "Changements récents qui n’ont pas encore été reçus",
+    "The server is not configured to indicate what the problem is (CORS).": "Le serveur n’est pas configuré pour indiquer quel est le problème (CORS).",
     "A connection error occurred while trying to contact the server.": "Une erreur de connexion est survenue en essayant de contacter le serveur.",
-    "Your area is experiencing difficulties connecting to the internet.": "Votre emplacement connaît des difficultés à se connecter à Internet.",
+    "Your area is experiencing difficulties connecting to the internet.": "Votre secteur connaît des difficultés à se connecter à Internet.",
     "The server has denied your request.": "Le serveur a refusé votre requête.",
     "The server is offline.": "Le serveur est éteint.",
     "A browser extension is preventing the request.": "Une extension du navigateur bloque la requête.",
     "Your firewall or anti-virus is blocking the request.": "Votre pare-feu ou votre antivirus bloque la requête.",
     "The server (%(serverName)s) took too long to respond.": "Le serveur (%(serverName)s) met trop de temps à répondre.",
-    "Your server isn't responding to some of your requests. Below are some of the most likely reasons.": "Votre serveur ne répond pas à certaines requêtes. Vous trouverez ci-dessus quelles sont la plupart des raisons.",
+    "Your server isn't responding to some of your requests. Below are some of the most likely reasons.": "Votre serveur ne répond pas à certaines requêtes. Vous trouverez ci-dessus quelles en sont les raisons probables.",
     "Server isn't responding": "Le serveur ne répond pas",
     "You're all caught up.": "Vous êtes à jour.",
     "Data on this screen is shared with %(widgetDomain)s": "Les données sur cet écran sont partagées avec %(widgetDomain)s",
     "Modal Widget": "Fenêtre de widget",
-    "Invite someone using their name, username (like <userId/>) or <a>share this room</a>.": "Invitez quelqu'un à partir de son nom, pseudo (comme <userId/>) ou <a>partagez ce salon</a>.",
-    "This won't invite them to %(communityName)s. To invite someone to %(communityName)s, click <a>here</a>": "Cela ne va pas l'inviter à %(communityName)s. Pour inviter quelqu'un à %(communityName)s, cliquez <a>ici</a>",
-    "Start a conversation with someone using their name or username (like <userId/>).": "Démarrer une conversation avec quelqu'un en utilisant son nom ou son pseudo (comme <userId/>).",
+    "Invite someone using their name, username (like <userId/>) or <a>share this room</a>.": "Invitez quelqu’un à partir de son nom, pseudo (comme <userId/>) ou <a>partagez ce salon</a>.",
+    "This won't invite them to %(communityName)s. To invite someone to %(communityName)s, click <a>here</a>": "Cela ne va pas l’inviter à %(communityName)s. Pour inviter quelqu’un à %(communityName)s, cliquez <a>ici</a>",
+    "Start a conversation with someone using their name or username (like <userId/>).": "Commencer une conversation privée avec quelqu’un en utilisant son nom ou son pseudo (comme <userId/>).",
     "May include members not in %(communityName)s": "Peut inclure des membres qui ne sont pas dans %(communityName)s",
     "Send feedback": "Envoyer un commentaire",
-    "PRO TIP: If you start a bug, please submit <debugLogsLink>debug logs</debugLogsLink> to help us track down the problem.": "CONSEIL : si vous reportez un bug, merci d'envoyer <debugLogsLink>les logs de débogage</debugLogsLink> pour nous aider à identifier le problème.",
-    "Please view <existingIssuesLink>existing bugs on Github</existingIssuesLink> first. No match? <newIssueLink>Start a new one</newIssueLink>.": "Merci de regarder d'abord les <existingIssuesLink>bugs déjà répertoriés sur Github</existingIssuesLink>. Pas de résultat ? <newIssueLink>Reportez un nouveau bug</newIssueLink>.",
-    "Report a bug": "Reporter un bug",
+    "PRO TIP: If you start a bug, please submit <debugLogsLink>debug logs</debugLogsLink> to help us track down the problem.": "CONSEIL : si vous rapportez un bug, merci d’envoyer <debugLogsLink>les journaux de débogage</debugLogsLink> pour nous aider à identifier le problème.",
+    "Please view <existingIssuesLink>existing bugs on Github</existingIssuesLink> first. No match? <newIssueLink>Start a new one</newIssueLink>.": "Merci de regarder d’abord les <existingIssuesLink>bugs déjà répertoriés sur Github</existingIssuesLink>. Pas de résultat ? <newIssueLink>Rapportez un nouveau bug</newIssueLink>.",
+    "Report a bug": "Rapporter un bug",
     "There are two ways you can provide feedback and help us improve %(brand)s.": "Il y a deux manières pour que vous puissiez faire vos retour et nous aider à améliorer %(brand)s.",
     "Comment": "Commentaire",
     "Add comment": "Ajouter un commentaire",
-    "Please go into as much detail as you like, so we can track down the problem.": "Merci d'ajouter le plus de détails possible, pour que nous puissions mieux identifier le problème.",
+    "Please go into as much detail as you like, so we can track down the problem.": "Merci d’ajouter le plus de détails possible, pour que nous puissions mieux identifier le problème.",
     "Tell us below how you feel about %(brand)s so far.": "Dites-nous ci-dessous quel est votre ressenti à propos de %(brand)s jusque là.",
     "Rate %(brand)s": "Noter %(brand)s",
     "Feedback sent": "Commentaire envoyé",
     "Update community": "Modifier la communauté",
     "There was an error updating your community. The server is unable to process your request.": "Une erreur est survenue lors de la mise à jour de votre communauté. Le serveur est incapable de traiter votre requête.",
-    "Block anyone not part of %(serverName)s from ever joining this room.": "Bloque n'importe qui qui n'est pas membre de %(serverName)s de rejoindre ce salon.",
-    "You might disable this if the room will be used for collaborating with external teams who have their own homeserver. This cannot be changed later.": "Vous devriez le déactiver si le salon est utilisé pour collaborer avec des équipes externes qui ont leur propre serveur d'accueil. Ce ne peut pas être changé plus tard.",
-    "You might enable this if the room will only be used for collaborating with internal teams on your homeserver. This cannot be changed later.": "Vous devriez l'activer si le salon n'est utilisé que pour collaborer avec des équipes internes sur votre serveur d'accueil. Ce ne peut pas être changé plus tard.",
-    "Your server requires encryption to be enabled in private rooms.": "Votre serveur requiert d'activer le chiffrement dans les salons privés.",
-    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone in this community.": "Les salons privés ne peuvent être trouvés et rejoints seulement par invitation. Les salons publics peut être trouvés et rejoints par n'importe qui dans cette communauté.",
-    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone.": "Les salons privés ne peuvent être trouvés et rejoints seulement par invitation. Les salons publics peut être trouvés et rejoints par n'importe qui.",
-    "Start a new chat": "Commencer une nouvelle discussion",
+    "Block anyone not part of %(serverName)s from ever joining this room.": "Empêche n’importe qui n’étant pas membre de %(serverName)s de rejoindre ce salon.",
+    "You might disable this if the room will be used for collaborating with external teams who have their own homeserver. This cannot be changed later.": "Vous devriez le déactiver si le salon est utilisé pour collaborer avec des équipes externes qui ont leur propre serveur d’accueil. Ceci ne peut pas être changé plus tard.",
+    "You might enable this if the room will only be used for collaborating with internal teams on your homeserver. This cannot be changed later.": "Vous devriez l’activer si le salon n’est utilisé que pour collaborer avec des équipes internes sur votre serveur d’accueil. Ceci ne peut pas être changé plus tard.",
+    "Your server requires encryption to be enabled in private rooms.": "Votre serveur impose d’activer le chiffrement dans les salons privés.",
+    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone in this community.": "Les salons privés ne peuvent être trouvés et rejoints seulement par invitation. Les salons publics peut être trouvés et rejoints par n’importe qui dans cette communauté.",
+    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone.": "Les salons privés ne peuvent être trouvés et rejoints seulement par invitation. Les salons publics peut être trouvés et rejoints par n’importe qui.",
+    "Start a new chat": "Commencer une nouvelle conversation privée",
     "Add a photo so people know it's you.": "Ajoutez une photo pour que les gens sachent qu’il s’agit de vous.",
     "%(ssoButtons)s Or %(usernamePassword)s": "%(ssoButtons)s ou %(usernamePassword)s",
     "Decide where your account is hosted": "Décidez où votre compte est hébergé",
-    "Go to Home View": "Revenir à la page d'accueil",
+    "Go to Home View": "Revenir à la page d’accueil",
     "Use Ctrl + Enter to send a message": "Utilisez Ctrl + Entrée pour envoyer un message",
-    "%(senderName)s ended the call": "%(senderName)s a terminé l'appel",
-    "You ended the call": "Vous avez terminé l'appel",
-    "%(creator)s created this DM.": "%(creator)s a envoyé ce DM.",
-    "Now, let's help you get started": "Maintenant, commençons à vous initier",
+    "%(senderName)s ended the call": "%(senderName)s a terminé l’appel",
+    "You ended the call": "Vous avez terminé l’appel",
+    "%(creator)s created this DM.": "%(creator)s a créé cette conversation privée.",
+    "Now, let's help you get started": "Maintenant, initions vous",
     "Welcome %(name)s": "Bienvenue %(name)s",
     "Filter rooms and people": "Filtrer des salons et personnes",
-    "Got an account? <a>Sign in</a>": "Vous avez un compte ? <a>Connectez-vous</a>",
-    "New here? <a>Create an account</a>": "Nouveau ici ? <a>Créez un compte</a>",
-    "There was a problem communicating with the homeserver, please try again later.": "Il y a eu un problème lors de la communication avec le serveur d'accueil, veuillez réessayer ultérieurement.",
-    "New? <a>Create account</a>": "Nouveau ? <a>Créez un compte</a>",
-    "That username already exists, please try another.": "Ce nom d'utilisateur existe déjà, essayez-en un autre.",
-    "Already have an account? <a>Sign in here</a>": "Vous avez déjà un compte ? <a>Connectez-vous ici</a>",
+    "Got an account? <a>Sign in</a>": "Vous avez un compte ? <a>Connectez-vous</a>",
+    "New here? <a>Create an account</a>": "Nouveau ici ? <a>Créez un compte</a>",
+    "There was a problem communicating with the homeserver, please try again later.": "Il y a eu un problème lors de la communication avec le serveur d’accueil, veuillez réessayer ultérieurement.",
+    "New? <a>Create account</a>": "Nouveau ? <a>Créez un compte</a>",
+    "That username already exists, please try another.": "Ce nom d’utilisateur existe déjà, essayez-en un autre.",
+    "Already have an account? <a>Sign in here</a>": "Vous avez déjà un compte ? <a>Connectez-vous ici</a>",
     "Algeria": "Algérie",
     "Albania": "Albanie",
     "Åland Islands": "Îles Åland",
@@ -2572,7 +2572,7 @@
     "United Kingdom": "Royaume-Uni",
     "You've reached the maximum number of simultaneous calls.": "Vous avez atteint le nombre maximum d’appels en simultané.",
     "No other application is using the webcam": "Aucune autre application n’est en train d’utiliser la caméra",
-    "A microphone and webcam are plugged in and set up correctly": "Un microphone et une caméra sont branchées et bien configurés",
+    "A microphone and webcam are plugged in and set up correctly": "Un microphone et une caméra sont branchés et bien configurés",
     "Unable to access webcam / microphone": "Impossible d’accéder à la caméra ou au microphone",
     "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "La fonction a échoué faute de pouvoir accéder au microphone. Vérifiez qu’un microphone est branché et bien configuré.",
     "Unable to access microphone": "Impossible d’accéder au microphone",
@@ -2594,12 +2594,12 @@
     "Angola": "République d’Angola",
     "Andorra": "Andorre",
     "American Samoa": "Samoa américaines",
-    "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.": "Invitez quelqu'un via leur nom, e-mail ou nom d'utilisateur (p. ex. <userId/>) ou <a>partagez ce salon</a>.",
-    "Start a conversation with someone using their name, email address or username (like <userId/>).": "Commencer une conversation avec quelqu'un via leur nom, e-mail ou nom d'utilisateur (comme par exemple <userId/>).",
+    "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.": "Invitez quelqu’un via son nom, e-mail ou pseudo (p. ex. <userId/>) ou <a>partagez ce salon</a>.",
+    "Start a conversation with someone using their name, email address or username (like <userId/>).": "Commencer une conversation privée avec quelqu’un via son nom, e-mail ou pseudo (comme par exemple <userId/>).",
     "Too Many Calls": "Trop d’appels",
     "Permission is granted to use the webcam": "L’autorisation d’accéder à la caméra a été accordée",
     "Call failed because webcam or microphone could not be accessed. Check that:": "La fonction a échoué faute de pouvoir accéder à la caméra ou au microphone. Vérifiez que :",
-    "Send stickers to this room as you": "Envoyer des stickers dans ce salon en tant que vous-même",
+    "Send stickers to this room as you": "Envoyer des autocollants dans ce salon sous votre nom",
     "Zambia": "Zambie",
     "Yemen": "Yémen",
     "Western Sahara": "Sahara occidental",
@@ -2827,13 +2827,13 @@
     "Bermuda": "Bermudes",
     "with state key %(stateKey)s": "avec la ou les clés d’état %(stateKey)s",
     "with an empty state key": "avec une clé d’état vide",
-    "See when anyone posts a sticker to your active room": "Voir quand n’importe qui envoie un sticker dans le salon actuel",
-    "See when a sticker is posted in this room": "Voir quand un sticker est envoyé dans ce salon",
+    "See when anyone posts a sticker to your active room": "Voir quand n’importe qui envoie un autocollant dans le salon actuel",
+    "See when a sticker is posted in this room": "Voir quand un autocollant est envoyé dans ce salon",
     "See when the avatar changes in your active room": "Voir quand l’avatar change dans le salon actuel",
     "Change the avatar of your active room": "Changer l’avatar du salon actuel",
     "See when the avatar changes in this room": "Voir quand l’avatar change dans ce salon",
     "Change the avatar of this room": "Changer l’avatar de ce salon",
-    "Send stickers into your active room": "Envoyer des stickers dans le salon actuel",
+    "Send stickers into your active room": "Envoyer des autocollants dans le salon actuel",
     "See when the topic changes in this room": "Voir quand le sujet change dans ce salon",
     "See when the topic changes in your active room": "Voir quand le sujet change dans le salon actuel",
     "Change the name of your active room": "Changer le nom du salon actuel",
@@ -2841,10 +2841,10 @@
     "Change the name of this room": "Changer le nom de ce salon",
     "Change the topic of your active room": "Changer le sujet dans le salon actuel",
     "Change the topic of this room": "Changer le sujet de ce salon",
-    "Send stickers into this room": "Envoyer des stickers dans ce salon",
+    "Send stickers into this room": "Envoyer des autocollants dans ce salon",
     "Remain on your screen when viewing another room, when running": "Reste sur votre écran quand vous regardez un autre salon lors de l’appel",
-    "Takes the call in the current room off hold": "Reprend l’appel en cours dans ce salon",
-    "Places the call in the current room on hold": "Met l’appel en pause dans ce salon",
+    "Takes the call in the current room off hold": "Reprend l’appel en attente dans ce salon",
+    "Places the call in the current room on hold": "Met l’appel dans ce salon en attente",
     "Prepends (╯°□°）╯︵ ┻━┻ to a plain-text message": "Ajoute (╯°□°）╯︵ ┻━┻ en préfixe du message",
     "Prepends ┬──┬ ノ( ゜-゜ノ) to a plain-text message": "Ajoute ┬──┬ ノ( ゜-゜ノ) en préfixe du message",
     "Effects": "Effets",
@@ -2857,102 +2857,102 @@
     "Send emotes as you in this room": "Envoyer des réactions sous votre nom dans ce salon",
     "See videos posted to your active room": "Voir les vidéos publiées dans votre salon actif",
     "See videos posted to this room": "Voir les vidéos publiées dans ce salon",
-    "Send videos as you in your active room": "Envoie des vidéos en tant que vous-même dans votre salon actuel",
-    "Send videos as you in this room": "Envoie des vidéos en tant que vous dans ce salon",
+    "Send videos as you in your active room": "Envoie des vidéos sous votre nom dans votre salon actuel",
+    "Send videos as you in this room": "Envoie des vidéos sous votre nom dans ce salon",
     "See images posted to this room": "Voir les images publiées dans ce salon",
     "See images posted to your active room": "Voir les images publiées dans votre salon actif",
     "See messages posted to your active room": "Voir les messages publiés dans votre salon actif",
     "See messages posted to this room": "Voir les messages publiés dans ce salon",
-    "Send messages as you in your active room": "Envoie des messages en tant que vous-même dans votre salon actif",
-    "Send messages as you in this room": "Envoie des messages en tant que vous-même dans ce salon",
+    "Send messages as you in your active room": "Envoie des messages sous votre nom dans votre salon actif",
+    "Send messages as you in this room": "Envoie des messages sous votre nom dans ce salon",
     "The <b>%(capability)s</b> capability": "La capacité <b>%(capability)s</b>",
     "See <b>%(eventType)s</b> events posted to your active room": "Voir les événements <b>%(eventType)s</b> publiés dans votre salon actuel",
-    "Send <b>%(eventType)s</b> events as you in your active room": "Envoie des événements <b>%(eventType)s</b> en tant que vous-même dans votre salon actuel",
+    "Send <b>%(eventType)s</b> events as you in your active room": "Envoie des événements <b>%(eventType)s</b> sous votre nom dans votre salon actuel",
     "See <b>%(eventType)s</b> events posted to this room": "Voir les événements <b>%(eventType)s</b> publiés dans ce salon",
-    "Send <b>%(eventType)s</b> events as you in this room": "Envoie des événements <b>%(eventType)s</b> en tant que vous-même dans ce salon",
-    "Send stickers to your active room as you": "Envoie des stickers en tant que vous-même dans le salon actuel",
+    "Send <b>%(eventType)s</b> events as you in this room": "Envoie des événements <b>%(eventType)s</b> sous votre nom dans ce salon",
+    "Send stickers to your active room as you": "Envoie des autocollants sous votre nom dans le salon actuel",
     "Continue with %(ssoButtons)s": "Continuer avec %(ssoButtons)s",
-    "About homeservers": "À propos des serveurs d'accueils",
+    "About homeservers": "À propos des serveurs d’accueil",
     "Learn more": "En savoir plus",
-    "Use your preferred Matrix homeserver if you have one, or host your own.": "Utilisez votre serveur d'accueil Matrix préféré si vous en avez un, ou hébergez le vôtre.",
-    "Other homeserver": "Autre serveur d'accueil",
-    "We call the places where you can host your account ‘homeservers’.": "Nous appelons ‘serveur d'accueils’ les lieux où vous pouvez héberger votre compte.",
-    "Sign into your homeserver": "Connectez-vous sur votre serveur d'accueil",
-    "Matrix.org is the biggest public homeserver in the world, so it’s a good place for many.": "Matrix.org est le plus grand serveur d'accueil dans le monde, donc c'est un bon lieu pour beaucoup.",
-    "Specify a homeserver": "Spécifiez un serveur d'accueil",
+    "Use your preferred Matrix homeserver if you have one, or host your own.": "Utilisez votre serveur d’accueil Matrix préféré si vous en avez un, ou hébergez le vôtre.",
+    "Other homeserver": "Autre serveur d’accueil",
+    "We call the places where you can host your account ‘homeservers’.": "Nous appelons « serveur d’accueil » les lieux où vous pouvez héberger votre compte.",
+    "Sign into your homeserver": "Connectez-vous sur votre serveur d’accueil",
+    "Matrix.org is the biggest public homeserver in the world, so it’s a good place for many.": "Matrix.org est le plus grand serveur d’accueil du monde, ce qui en fait un endroit agréable pour le plus grand nombre.",
+    "Specify a homeserver": "Spécifiez un serveur d’accueil",
     "Invalid URL": "URL invalide",
-    "Unable to validate homeserver": "Impossible de valider le serveur d'accueil",
-    "Just a heads up, if you don't add an email and forget your password, you could <b>permanently lose access to your account</b>.": "Juste une remarque, si vous n'ajoutez pas un email et que vous oubliez votre mot de passe, vous pourriez <b>perdre définitivement l'accés à votre compte</b>.",
-    "Continuing without email": "Continuer sans email",
+    "Unable to validate homeserver": "Impossible de valider le serveur d’accueil",
+    "Just a heads up, if you don't add an email and forget your password, you could <b>permanently lose access to your account</b>.": "Juste une remarque, si vous n'ajoutez pas d’e-mail et que vous oubliez votre mot de passe, vous pourriez <b>perdre définitivement l’accès à votre compte</b>.",
+    "Continuing without email": "Continuer sans e-mail",
     "Transfer": "Transférer",
-    "Failed to transfer call": "N'a pas réussi à transférer l'appel",
-    "A call can only be transferred to a single user.": "Un appel peut seulement être transféré à un seul utilisateur.",
-    "Invite by email": "Inviter par email",
-    "Active Widgets": "Gadgets actifs",
+    "Failed to transfer call": "Échec du transfert de l’appel",
+    "A call can only be transferred to a single user.": "Un appel ne peut être transféré qu’à un seul utilisateur.",
+    "Invite by email": "Inviter par e-mail",
+    "Active Widgets": "Widgets actifs",
     "Reason (optional)": "Raison (optionnelle)",
     "Continue with %(provider)s": "Continuer avec %(provider)s",
-    "Homeserver": "Serveur d'accueil",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Element with an existing Matrix account on a different homeserver.": "Vous pouvez utiliser les options de serveur personnalisés pour vous connecter à d'autres serveurs Matrix en spécifiant une URL de serveur d'accueil différente. Celà vous permet d'utiliser Element avec un compte Matrix existant sur un serveur d'accueil différent.",
+    "Homeserver": "Serveur d’accueil",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Element with an existing Matrix account on a different homeserver.": "Vous pouvez utiliser les options de serveur personnalisés pour vous connecter à d’autres serveurs Matrix en spécifiant une URL de serveur d’accueil différente. Cela vous permet d’utiliser Element avec un compte Matrix existant sur un serveur d’accueil différent.",
     "Server Options": "Options serveur",
     "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "Les messages ici sont chiffrés de bout en bout. Quand les gens joignent, vous pouvez les vérifier dans leur profil, tapez simplement sur leur avatar.",
     "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.": "Les messages ici sont chiffrés de bout en bout. Vérifiez %(displayName)s dans leur profil - tapez sur leur avatar.",
     "Role": "Rôle",
-    "Use the + to make a new room or explore existing ones below": "Utilisez le + pour créer un nouveau salon ou explorer les existantes ci-dessous",
-    "This is the start of <roomName/>.": "C'est le début de <roomName/>.",
+    "Use the + to make a new room or explore existing ones below": "Utilisez le + pour créer un nouveau salon ou explorer ceux existant ci-dessous",
+    "This is the start of <roomName/>.": "C’est le début de <roomName/>.",
     "Add a photo, so people can easily spot your room.": "Ajoutez une photo afin que les gens repèrent facilement votre salon.",
     "%(displayName)s created this room.": "%(displayName)s a créé ce salon.",
     "You created this room.": "Vous avez créé ce salon.",
     "<a>Add a topic</a> to help people know what it is about.": "<a>Ajoutez un sujet</a> pour aider les gens à savoir de quoi il est question.",
-    "Topic: %(topic)s ": "Sujet : %(topic)s ",
-    "Topic: %(topic)s (<a>edit</a>)": "Sujet : %(topic)s (<a>éditer</a>)",
-    "This is the beginning of your direct message history with <displayName/>.": "C'est le début de votre historique de messages direct avec <displayName/>.",
-    "Only the two of you are in this conversation, unless either of you invites anyone to join.": "Seulement vous deux êtes dans cette conversation, à moins que l'un de vous invite quelqu'un à joindre.",
+    "Topic: %(topic)s ": "Sujet : %(topic)s ",
+    "Topic: %(topic)s (<a>edit</a>)": "Sujet : %(topic)s (<a>modifier</a>)",
+    "This is the beginning of your direct message history with <displayName/>.": "C’est le début de votre historique de messages privés avec <displayName/>.",
+    "Only the two of you are in this conversation, unless either of you invites anyone to join.": "Vous n’êtes que tous les deux dans cette conversation, à moins que l’un de vous invite quelqu’un.",
     "%(name)s on hold": "%(name)s est en attente",
-    "Return to call": "Revenir à l'appel",
-    "Fill Screen": "Remplir l'écran",
-    "Voice Call": "Appel vocal",
+    "Return to call": "Revenir à l’appel",
+    "Fill Screen": "Remplir l’écran",
+    "Voice Call": "Appel audio",
     "Video Call": "Appel vidéo",
-    "%(peerName)s held the call": "%(peerName)s a mis l'appel en pause",
-    "You held the call <a>Resume</a>": "Vous avez mis l'appel en attente <a>Reprendre</a>",
-    "You held the call <a>Switch</a>": "Vous avez mis l'appel en attente <a>Basculer</a>",
+    "%(peerName)s held the call": "%(peerName)s a mis l’appel en attente",
+    "You held the call <a>Resume</a>": "Vous avez mis l’appel en attente <a>Reprendre</a>",
+    "You held the call <a>Switch</a>": "Vous avez mis l’appel en attente <a>Basculer</a>",
     "sends snowfall": "envoie une chute de neige",
     "Sends the given message with snowfall": "Envoie le message donné avec une chute de neige",
-    "sends fireworks": "envoie des feux d'artifices",
+    "sends fireworks": "envoie des feux d’artifices",
     "Sends the given message with fireworks": "Envoie le message donné avec des feux d'artifices",
     "sends confetti": "envoie des confettis",
     "Sends the given message with confetti": "Envoie le message avec des confettis",
     "Show chat effects": "Montrer les effets cosmétiques du chat",
     "Use Command + Enter to send a message": "Utilisez Ctrl + Entrée pour envoyer un message",
-    "Render LaTeX maths in messages": "Formate et affiche les maths format LaTeX dans les messages",
+    "Render LaTeX maths in messages": "Affiche les formules mathématiques au format LaTeX dans les messages",
     "New version of %(brand)s is available": "Nouvelle version de %(brand)s disponible",
     "Update %(brand)s": "Mettre à jour %(brand)s",
     "Enable desktop notifications": "Activer les notifications sur le bureau",
     "Don't miss a reply": "Ne ratez pas une réponse",
     "See <b>%(msgtype)s</b> messages posted to your active room": "Voir les messages de type <b>%(msgtype)s</b> publiés dans le salon actuel",
     "See <b>%(msgtype)s</b> messages posted to this room": "Voir les messages de type <b>%(msgtype)s</b> publiés dans ce salon",
-    "Send <b>%(msgtype)s</b> messages as you in this room": "Envoie des messages de type<b>%(msgtype)s</b> en tant que vous-même dans ce salon",
-    "Send <b>%(msgtype)s</b> messages as you in your active room": "Envoie des messages de type <b>%(msgtype)s</b> en tant que vous-même dans votre salon actif",
+    "Send <b>%(msgtype)s</b> messages as you in this room": "Envoie des messages de type<b>%(msgtype)s</b> sous votre nom dans ce salon",
+    "Send <b>%(msgtype)s</b> messages as you in your active room": "Envoie des messages de type <b>%(msgtype)s</b> sous votre nom dans votre salon actif",
     "See general files posted to your active room": "Voir les fichiers postés dans votre salon actuel",
     "See general files posted to this room": "Voir les fichiers postés dans ce salon",
-    "Send general files as you in your active room": "Envoyer des fichiers en tant que vous-même dans votre salon actif",
-    "Send general files as you in this room": "Envoyer des fichiers en tant que vous-même dans ce salon",
+    "Send general files as you in your active room": "Envoyer des fichiers sous votre nom dans votre salon actif",
+    "Send general files as you in this room": "Envoyer des fichiers sous votre nom dans ce salon",
     "Search (must be enabled)": "Recherche (si activée)",
-    "This session has detected that your Security Phrase and key for Secure Messages have been removed.": "Cette session a détecté que votre phrase de passe et clé de sécurité pour les messages sécurisés ont été supprimées.",
-    "A new Security Phrase and key for Secure Messages have been detected.": "Une nouvelle phrase de passe et clé pour les messages sécurisés ont été détectées.",
-    "Make a copy of your Security Key": "Faire une copie de votre Clé de Sécurité",
-    "Confirm your Security Phrase": "Confirmez votre phrase de passe",
-    "Secure your backup with a Security Phrase": "Protégez votre sauvegarde avec une Clé de Sécurité",
-    "Your Security Key is in your <b>Downloads</b> folder.": "Votre Clé de Sécurité est dans le répertoire <b>Téléchargements</b>.",
-    "Your Security Key has been <b>copied to your clipboard</b>, paste it to:": "Votre Clé de Sécurité a été <b>copiée dans votre presse-papier</b>, copiez la pour :",
-    "Your Security Key": "Votre Clé de Sécurité",
-    "Your Security Key is a safety net - you can use it to restore access to your encrypted messages if you forget your Security Phrase.": "Votre Clé de Sécurité est un filet de sécurité. Vous pouvez l’utiliser pour retrouver l’accès à vos messages chiffrés si vous oubliez votre phrase de passe.",
-    "Repeat your Security Phrase...": "Répétez votre phrase de passe…",
-    "Please enter your Security Phrase a second time to confirm.": "Merci de saisir votre phrase de passe une seconde fois pour confirmer.",
-    "Set up with a Security Key": "Configurer avec une Clé de Sécurité",
-    "Great! This Security Phrase looks strong enough.": "Super ! Cette phrase de passe a l’air assez solide.",
-    "We'll store an encrypted copy of your keys on our server. Secure your backup with a Security Phrase.": "Nous avons stocké une copie chiffrée de vos clés sur notre serveur. Sécurisez vos sauvegardes avec une phrase de passe.",
-    "Use Security Key": "Utiliser la Clé de Sécurité",
-    "Use Security Key or Phrase": "Utilisez votre Clé de Sécurité ou phrase de passe",
+    "This session has detected that your Security Phrase and key for Secure Messages have been removed.": "Cette session a détecté que votre phrase secrète et clé de sécurité pour les messages sécurisés ont été supprimées.",
+    "A new Security Phrase and key for Secure Messages have been detected.": "Une nouvelle phrase secrète et clé de sécurité pour les messages sécurisés ont été détectées.",
+    "Make a copy of your Security Key": "Faire une copie de votre clé de sécurité",
+    "Confirm your Security Phrase": "Confirmez votre phrase secrète",
+    "Secure your backup with a Security Phrase": "Protégez votre sauvegarde avec une clé de sécurité",
+    "Your Security Key is in your <b>Downloads</b> folder.": "Votre clé de sécurité est dans le répertoire <b>Téléchargements</b>.",
+    "Your Security Key has been <b>copied to your clipboard</b>, paste it to:": "Votre clé de Sécurité a été <b>copiée dans votre presse-papier</b>, copiez la pour :",
+    "Your Security Key": "Votre clé de sécurité",
+    "Your Security Key is a safety net - you can use it to restore access to your encrypted messages if you forget your Security Phrase.": "Votre clé de sécurité est un filet de sécurité. Vous pouvez l’utiliser pour retrouver l’accès à vos messages chiffrés si vous oubliez votre phrase secrète.",
+    "Repeat your Security Phrase...": "Répétez votre phrase secrète…",
+    "Please enter your Security Phrase a second time to confirm.": "Merci de saisir votre phrase secrète une seconde fois pour confirmer.",
+    "Set up with a Security Key": "Configurer avec une clé de sécurité",
+    "Great! This Security Phrase looks strong enough.": "Super ! Cette phrase secrète a l’air assez solide.",
+    "We'll store an encrypted copy of your keys on our server. Secure your backup with a Security Phrase.": "Nous allons stocker une copie chiffrée de vos clés sur notre serveur. Protégez vos sauvegardes avec une phrase secrète.",
+    "Use Security Key": "Utiliser la clé de sécurité",
+    "Use Security Key or Phrase": "Utilisez votre clé de sécurité ou phrase secrète",
     "You have no visible notifications.": "Vous n’avez aucune notification visible.",
     "Upgrade to pro": "Mettre à jour vers pro",
     "Great, that'll help people know it's you": "Super, ceci aidera des personnes à confirmer qu’il s’agit bien de vous",
@@ -2969,19 +2969,19 @@
     "A confirmation email has been sent to %(emailAddress)s": "Un e-mail de confirmation a été envoyé à %(emailAddress)s",
     "Hold": "Mettre en pause",
     "Resume": "Reprendre",
-    "If you've forgotten your Security Key you can <button>set up new recovery options</button>": "Si vous avez oublié votre Clé de Sécurité, vous pouvez <button>définir de nouvelles options de récupération</button>",
-    "Access your secure message history and set up secure messaging by entering your Security Key.": "Accédez à votre historique de messages chiffrés et mettez en place la messagerie sécurisée en entrant votre Clé de Sécurité.",
-    "Not a valid Security Key": "Clé de Sécurité invalide",
-    "This looks like a valid Security Key!": "Ça ressemble à une Clé de Sécurité !",
+    "If you've forgotten your Security Key you can <button>set up new recovery options</button>": "Si vous avez oublié votre clé de sécurité, vous pouvez <button>définir de nouvelles options de récupération</button>",
+    "Access your secure message history and set up secure messaging by entering your Security Key.": "Accédez à votre historique de messages chiffrés et mettez en place la messagerie sécurisée en entrant votre clé de sécurité.",
+    "Not a valid Security Key": "Clé de sécurité invalide",
+    "This looks like a valid Security Key!": "Ça ressemble à une clé de sécurité !",
     "Enter Security Key": "Saisir la clé de sécurité",
-    "If you've forgotten your Security Phrase you can <button1>use your Security Key</button1> or <button2>set up new recovery options</button2>": "Si vous avez oublié votre phrase de passe vous pouvez <button1>utiliser votre Clé de Sécurité</button1> ou <button2>définir de nouvelles options de récupération</button2>",
-    "Access your secure message history and set up secure messaging by entering your Security Phrase.": "Accédez à votre historique de messages chiffrés et mettez en place la messagerie sécurisée en entrant votre phrase de passe.",
-    "Enter Security Phrase": "Saisir la phrase de passe",
-    "Backup could not be decrypted with this Security Phrase: please verify that you entered the correct Security Phrase.": "La sauvegarde n’a pas pu être déchiffrée avec cette phrase de passe : merci de vérifier que vous avez saisi la bonne phrase de passe.",
-    "Incorrect Security Phrase": "Phrase de passe incorrecte",
-    "Backup could not be decrypted with this Security Key: please verify that you entered the correct Security Key.": "La sauvegarde n’a pas pu être déchiffrée avec cette Clé de Sécurité : merci de vérifier que vous avez saisi la bonne Clé de Sécurité.",
-    "Security Key mismatch": "Pas de correspondance entre les Clés de Sécurité",
-    "Unable to access secret storage. Please verify that you entered the correct Security Phrase.": "Impossible d’accéder à l’espace de stockage sécurisé. Merci de vérifier que vous avez saisi la bonne phrase de passe.",
+    "If you've forgotten your Security Phrase you can <button1>use your Security Key</button1> or <button2>set up new recovery options</button2>": "Si vous avez oublié votre phrase secrète vous pouvez <button1>utiliser votre clé de sécurité</button1> ou <button2>définir de nouvelles options de récupération</button2>",
+    "Access your secure message history and set up secure messaging by entering your Security Phrase.": "Accédez à votre historique de messages chiffrés et mettez en place la messagerie sécurisée en entrant votre phrase secrète.",
+    "Enter Security Phrase": "Saisir la phrase de secrète",
+    "Backup could not be decrypted with this Security Phrase: please verify that you entered the correct Security Phrase.": "La sauvegarde n’a pas pu être déchiffrée avec cette phrase secrète : merci de vérifier que vous avez saisi la bonne phrase secrète.",
+    "Incorrect Security Phrase": "Phrase secrète incorrecte",
+    "Backup could not be decrypted with this Security Key: please verify that you entered the correct Security Key.": "La sauvegarde n’a pas pu être déchiffrée avec cette clé de sécurité : merci de vérifier que vous avez saisi la bonne clé de sécurité.",
+    "Security Key mismatch": "Pas de correspondance entre les clés de sécurité",
+    "Unable to access secret storage. Please verify that you entered the correct Security Phrase.": "Impossible d’accéder à l’espace de stockage sécurisé. Merci de vérifier que vous avez saisi la bonne phrase secrète.",
     "Invalid Security Key": "Clé de Sécurité invalide",
     "Wrong Security Key": "Mauvaise Clé de Sécurité",
     "Remember this": "Mémoriser ceci",
@@ -2995,14 +2995,14 @@
     "Minimize dialog": "Réduire la modale",
     "Maximize dialog": "Maximiser la modale",
     "%(hostSignupBrand)s Setup": "Configuration de %(hostSignupBrand)s",
-    "You should know": "Vous devriez connaître",
+    "You should know": "Vous devriez prendre connaissance de",
     "Privacy Policy": "Politique de confidentialité",
     "Cookie Policy": "Politique de gestion des cookies",
     "Learn more in our <privacyPolicyLink />, <termsOfServiceLink /> and <cookiePolicyLink />.": "Consultez nos <privacyPolicyLink />, <termsOfServiceLink /> et <cookiePolicyLink />.",
-    "Continuing temporarily allows the %(hostSignupBrand)s setup process to access your account to fetch verified email addresses. This data is not stored.": "Continuer permettra temporairement au processus de configuration de %(hostSignupBrand)s d’accéder à votre compte pour récupérer les adresses email vérifiées. Les données ne sont pas stockées.",
+    "Continuing temporarily allows the %(hostSignupBrand)s setup process to access your account to fetch verified email addresses. This data is not stored.": "Continuer permettra temporairement au processus de configuration de %(hostSignupBrand)s d’accéder à votre compte pour récupérer les adresses e-mail vérifiées. Les données ne sont pas stockées.",
     "Failed to connect to your homeserver. Please close this dialog and try again.": "Impossible de vous connecter à votre serveur d’accueil. Merci de fermer cette modale et de réessayer.",
     "Abort": "Annuler",
-    "Are you sure you wish to abort creation of the host? The process cannot be continued.": "Êtes-vous sûr de vouloir annuler la création de cet hôte ? Le process ne pourra pas être repris.",
+    "Are you sure you wish to abort creation of the host? The process cannot be continued.": "Êtes-vous sûr de vouloir annuler la création de cet hôte ? Le processus ne pourra pas être repris.",
     "Confirm abort of host creation": "Confirmer l’annulation de la création de cet hôte",
     "There was an error finding this widget.": "Erreur lors de la récupération de ce widget.",
     "Windows": "Windows",
@@ -3010,9 +3010,9 @@
     "Share your screen": "Partager votre écran",
     "Set my room layout for everyone": "Définir ma disposition de salon pour tout le monde",
     "Open dial pad": "Ouvrir le pavé de numérotation",
-    "Start a Conversation": "Démarrer une conversation",
+    "Start a Conversation": "Commencer une conversation",
     "Recently visited rooms": "Salons visités récemment",
-    "Back up your encryption keys with your account data in case you lose access to your sessions. Your keys will be secured with a unique Security Key.": "Sauvegardez vos clés de chiffrement et les données de votre compte au casoù vous perdiez l’accès à vos sessions. Vos clés seront sécurisés avec une Clé de Sécurité unique.",
+    "Back up your encryption keys with your account data in case you lose access to your sessions. Your keys will be secured with a unique Security Key.": "Sauvegardez vos clés de chiffrement et les données de votre compte au cas où vous perdiez l’accès à vos sessions. Vos clés seront sécurisés avec une Clé de Sécurité unique.",
     "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "Mettre en cache localement et de manière sécurisée les messages chiffrés pour qu’ils apparaissent dans les résultats de recherche, en utilisant %(size)s pour stocker les messages de %(rooms)s salons.",
     "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "Mettre en cache localement et de manière sécurisée les messages chiffrés pour qu’ils apparaissent dans les résultats de recherche, en utilisant %(size)s pour stocker les messages de %(rooms)s salons.",
     "Channel: <channelLink/>": "Canal : <channelLink/>",
@@ -3020,25 +3020,25 @@
     "Dial pad": "Pavé de numérotation",
     "There was an error looking up the phone number": "Erreur lors de la recherche de votre numéro de téléphone",
     "Unable to look up phone number": "Impossible de trouver votre numéro de téléphone",
-    "Use Ctrl + F to search": "Utilisez Control + F pour rechercher",
+    "Use Ctrl + F to search": "Utilisez Ctrl + F pour rechercher",
     "Use Command + F to search": "Utilisez Commande + F pour rechercher",
     "Show line numbers in code blocks": "Afficher les numéros de ligne dans les blocs de code",
-    "Expand code blocks by default": "Dérouler les blocs de code par défaut",
-    "Show stickers button": "Afficher le bouton stickers",
+    "Expand code blocks by default": "Développer les blocs de code par défaut",
+    "Show stickers button": "Afficher le bouton autocollants",
     "Use app": "Utiliser l’application",
     "Element Web is experimental on mobile. For a better experience and the latest features, use our free native app.": "Element Web est expérimental sur téléphone. Pour une meilleure expérience et bénéficier des dernières fonctionnalités, utilisez notre application native gratuite.",
     "Use app for a better experience": "Utilisez une application pour une meilleure expérience",
     "See text messages posted to your active room": "Voir les messages textuels dans le salon actif",
     "See text messages posted to this room": "Voir les messages textuels envoyés dans ce salon",
-    "Send text messages as you in your active room": "Envoyez des messages textuels en tant que vous-même dans le salon actif",
-    "Send text messages as you in this room": "Envoyez des messages textuels en tant que vous-même dans ce salon",
+    "Send text messages as you in your active room": "Envoyez des messages textuels sous votre nom dans le salon actif",
+    "Send text messages as you in this room": "Envoyez des messages textuels sous votre nom dans ce salon",
     "See when the name changes in your active room": "Suivre les changements de nom dans le salon actif",
     "Change which room, message, or user you're viewing": "Changer le salon, message, ou la personne que vous visualisez",
     "Change which room you're viewing": "Changer le salon que vous visualisez",
     "Remain on your screen while running": "Reste sur votre écran pendant l’exécution",
     "%(senderName)s has updated the widget layout": "%(senderName)s a mis à jour la disposition du widget",
-    "Converts the DM to a room": "Transforme le message privé en salon",
-    "Converts the room to a DM": "Transforme le salon en message privé",
+    "Converts the DM to a room": "Transforme la conversation privée en salon",
+    "Converts the room to a DM": "Transforme le salon en conversation privée",
     "Your homeserver rejected your log in attempt. This could be due to things just taking too long. Please try again. If this continues, please contact your homeserver administrator.": "Votre serveur d’accueil a rejeté la demande de connexion. Ceci pourrait être dû à une connexion qui prend trop de temps. Si cela persiste, merci de contacter l’administrateur de votre serveur d’accueil.",
     "Your homeserver was unreachable and was not able to log you in. Please try again. If this continues, please contact your homeserver administrator.": "Votre serveur d’accueil n’est pas accessible, nous n’avons pas pu vous connecter. Merci de réessayer. Si cela persiste, merci de contacter l’administrateur de votre serveur d’accueil.",
     "Try again": "Réessayez",

From 681529aa3cb54b630fd02a25613d4f9e7379c536 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 10 Mar 2021 17:26:35 +0000
Subject: [PATCH 249/420] Upgrade matrix-js-sdk to 9.9.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 7ed1b272da..e7fff438ff 100644
--- a/package.json
+++ b/package.json
@@ -80,7 +80,7 @@
     "katex": "^0.12.0",
     "linkifyjs": "^2.1.9",
     "lodash": "^4.17.20",
-    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
+    "matrix-js-sdk": "9.9.0-rc.1",
     "matrix-widget-api": "^0.1.0-beta.13",
     "minimist": "^1.2.5",
     "pako": "^2.0.3",
diff --git a/yarn.lock b/yarn.lock
index f99ea5900d..5c78e70590 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5572,9 +5572,10 @@ mathml-tag-names@^2.1.3:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
   integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
 
-"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
-  version "9.8.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/fb73ab687826e4d05fb8b424ab013a771213f84f"
+matrix-js-sdk@9.9.0-rc.1:
+  version "9.9.0-rc.1"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.9.0-rc.1.tgz#5ee28aee89a87ccdf742d1512bc44ec54454e94f"
+  integrity sha512-A3pY5CyCNE5+QdpYL/C7FGU8KjBojXRWbtWsbeTMFwZEuzkIYlCtev1i07NbN3kbF83R3TtOfSCxQITm1C5jwg==
   dependencies:
     "@babel/runtime" "^7.12.5"
     another-json "^0.2.0"

From 89f561a1ee645873e0a93fe1a6bc8967560ae8ab Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 10 Mar 2021 17:31:17 +0000
Subject: [PATCH 250/420] Prepare changelog for v3.16.0-rc.1

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c31eedf93b..d4ffeb5fbf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,110 @@
+Changes in [3.16.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.16.0-rc.1) (2021-03-10)
+===============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.15.0...v3.16.0-rc.1)
+
+ * Upgrade to JS SDK 9.9.0-rc.1
+ * Translations update from Weblate
+   [\#5743](https://github.com/matrix-org/matrix-react-sdk/pull/5743)
+ * Document behaviour of showReadReceipts=false for sent receipts
+   [\#5739](https://github.com/matrix-org/matrix-react-sdk/pull/5739)
+ * Tweak sent marker code style
+   [\#5741](https://github.com/matrix-org/matrix-react-sdk/pull/5741)
+ * Fix sent markers disappearing for edits/reactions
+   [\#5737](https://github.com/matrix-org/matrix-react-sdk/pull/5737)
+ * Ignore to-device decryption in the room list store
+   [\#5740](https://github.com/matrix-org/matrix-react-sdk/pull/5740)
+ * Spaces suggested rooms support
+   [\#5736](https://github.com/matrix-org/matrix-react-sdk/pull/5736)
+ * Add tooltips to sent/sending receipts
+   [\#5738](https://github.com/matrix-org/matrix-react-sdk/pull/5738)
+ * Remove a bunch of useless 'use strict' definitions
+   [\#5735](https://github.com/matrix-org/matrix-react-sdk/pull/5735)
+ * [SK-1] Fix types for replaceableComponent
+   [\#5732](https://github.com/matrix-org/matrix-react-sdk/pull/5732)
+ * [SK-2] Make debugging skinning problems easier
+   [\#5733](https://github.com/matrix-org/matrix-react-sdk/pull/5733)
+ * Support sending invite reasons with /invite command
+   [\#5695](https://github.com/matrix-org/matrix-react-sdk/pull/5695)
+ * Fix clicking on the avatar for opening member info requires pixel-perfect
+   accuracy
+   [\#5717](https://github.com/matrix-org/matrix-react-sdk/pull/5717)
+ * Display decrypted and encrypted event source on the same dialog
+   [\#5713](https://github.com/matrix-org/matrix-react-sdk/pull/5713)
+ * Fix units of TURN server expiry time
+   [\#5730](https://github.com/matrix-org/matrix-react-sdk/pull/5730)
+ * Display room name in pills instead of address
+   [\#5624](https://github.com/matrix-org/matrix-react-sdk/pull/5624)
+ * Refresh UI for file uploads
+   [\#5723](https://github.com/matrix-org/matrix-react-sdk/pull/5723)
+ * UI refresh for uploaded files
+   [\#5719](https://github.com/matrix-org/matrix-react-sdk/pull/5719)
+ * Improve message sending states to match new designs
+   [\#5699](https://github.com/matrix-org/matrix-react-sdk/pull/5699)
+ * Add clipboard write permission for widgets
+   [\#5725](https://github.com/matrix-org/matrix-react-sdk/pull/5725)
+ * Fix widget resizing
+   [\#5722](https://github.com/matrix-org/matrix-react-sdk/pull/5722)
+ * Option for audio streaming
+   [\#5707](https://github.com/matrix-org/matrix-react-sdk/pull/5707)
+ * Show a specific error for hs_disabled
+   [\#5576](https://github.com/matrix-org/matrix-react-sdk/pull/5576)
+ * Add Edge to the targets list
+   [\#5721](https://github.com/matrix-org/matrix-react-sdk/pull/5721)
+ * File drop UI fixes and improvements
+   [\#5505](https://github.com/matrix-org/matrix-react-sdk/pull/5505)
+ * Fix Bottom border of state counters is white on the dark theme
+   [\#5715](https://github.com/matrix-org/matrix-react-sdk/pull/5715)
+ * Trim spurious whitespace of nicknames
+   [\#5332](https://github.com/matrix-org/matrix-react-sdk/pull/5332)
+ * Ensure HostSignupDialog border colour matches light theme
+   [\#5716](https://github.com/matrix-org/matrix-react-sdk/pull/5716)
+ * Don't place another call if there's already one ongoing
+   [\#5712](https://github.com/matrix-org/matrix-react-sdk/pull/5712)
+ * Space room hierarchies
+   [\#5706](https://github.com/matrix-org/matrix-react-sdk/pull/5706)
+ * Iterate Space view and right panel
+   [\#5705](https://github.com/matrix-org/matrix-react-sdk/pull/5705)
+ * Add a scroll to bottom on message sent setting
+   [\#5692](https://github.com/matrix-org/matrix-react-sdk/pull/5692)
+ * Add .tmp files to gitignore
+   [\#5708](https://github.com/matrix-org/matrix-react-sdk/pull/5708)
+ * Initial Space Room View and Creation UX
+   [\#5704](https://github.com/matrix-org/matrix-react-sdk/pull/5704)
+ * Add multi language spell check
+   [\#5452](https://github.com/matrix-org/matrix-react-sdk/pull/5452)
+ * Fix tetris effect (holes) in read receipts
+   [\#5697](https://github.com/matrix-org/matrix-react-sdk/pull/5697)
+ * Fixed edit for markdown images
+   [\#5703](https://github.com/matrix-org/matrix-react-sdk/pull/5703)
+ * Iterate Space Panel
+   [\#5702](https://github.com/matrix-org/matrix-react-sdk/pull/5702)
+ * Fix read receipts for compact layout
+   [\#5700](https://github.com/matrix-org/matrix-react-sdk/pull/5700)
+ * Space Store and Space Panel for Room List filtering
+   [\#5689](https://github.com/matrix-org/matrix-react-sdk/pull/5689)
+ * Log when turn creds expire
+   [\#5691](https://github.com/matrix-org/matrix-react-sdk/pull/5691)
+ * Null check for maxHeight in call view
+   [\#5690](https://github.com/matrix-org/matrix-react-sdk/pull/5690)
+ * Autocomplete invited users
+   [\#5687](https://github.com/matrix-org/matrix-react-sdk/pull/5687)
+ * Add send message button
+   [\#5535](https://github.com/matrix-org/matrix-react-sdk/pull/5535)
+ * Move call buttons to the room header
+   [\#5693](https://github.com/matrix-org/matrix-react-sdk/pull/5693)
+ * Use the default SSSS key if the default is set
+   [\#5638](https://github.com/matrix-org/matrix-react-sdk/pull/5638)
+ * Initial Spaces feature flag
+   [\#5668](https://github.com/matrix-org/matrix-react-sdk/pull/5668)
+ * Clean up code edge cases and add helpers
+   [\#5667](https://github.com/matrix-org/matrix-react-sdk/pull/5667)
+ * Clean up widgets when leaving the room
+   [\#5684](https://github.com/matrix-org/matrix-react-sdk/pull/5684)
+ * Fix read receipts?
+   [\#5567](https://github.com/matrix-org/matrix-react-sdk/pull/5567)
+ * Fix MAU usage alerts
+   [\#5678](https://github.com/matrix-org/matrix-react-sdk/pull/5678)
+
 Changes in [3.15.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.15.0) (2021-03-01)
 =====================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.15.0-rc.1...v3.15.0)

From ad1f9edba8297495bf54675bf7c3555fa0b197b6 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 10 Mar 2021 17:31:19 +0000
Subject: [PATCH 251/420] v3.16.0-rc.1

---
 package.json | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index e7fff438ff..080b16b4ea 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "3.15.0",
+  "version": "3.16.0-rc.1",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {
@@ -27,7 +27,7 @@
     "matrix-gen-i18n": "scripts/gen-i18n.js",
     "matrix-prune-i18n": "scripts/prune-i18n.js"
   },
-  "main": "./src/index.js",
+  "main": "./lib/index.js",
   "matrix_src_main": "./src/index.js",
   "matrix_lib_main": "./lib/index.js",
   "matrix_lib_typings": "./lib/index.d.ts",
@@ -189,5 +189,6 @@
     "transformIgnorePatterns": [
       "/node_modules/(?!matrix-js-sdk).+$"
     ]
-  }
+  },
+  "typings": "./lib/index.d.ts"
 }

From 79ba898b3d6fc1264e785d24fbdfb3a8a9020854 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 10 Mar 2021 18:08:55 +0000
Subject: [PATCH 252/420] Prepare changelog for v3.16.0-rc.2

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d4ffeb5fbf..0b130d1c70 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+Changes in [3.16.0-rc.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.16.0-rc.2) (2021-03-10)
+===============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.16.0-rc.1...v3.16.0-rc.2)
+
+ * Fixed incorrect build output in rc.1
+
 Changes in [3.16.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.16.0-rc.1) (2021-03-10)
 ===============================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.15.0...v3.16.0-rc.1)

From 71a3847c35aac3ad58bf49b5e15d986b55d32464 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 10 Mar 2021 18:08:56 +0000
Subject: [PATCH 253/420] v3.16.0-rc.2

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

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

From 93f7f13c442c0faefd15d04e512bc3575c784585 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 3 Mar 2021 18:16:27 -0700
Subject: [PATCH 254/420] Early proof of concept for media customization
 support

---
 src/customisations/Media.ts                   | 138 ++++++++++++++++++
 .../models/IMediaEventContent.ts              |  87 +++++++++++
 src/utils/DecryptFile.js                      |   5 +-
 3 files changed, 228 insertions(+), 2 deletions(-)
 create mode 100644 src/customisations/Media.ts
 create mode 100644 src/customisations/models/IMediaEventContent.ts

diff --git a/src/customisations/Media.ts b/src/customisations/Media.ts
new file mode 100644
index 0000000000..27abc6bc50
--- /dev/null
+++ b/src/customisations/Media.ts
@@ -0,0 +1,138 @@
+/*
+ * Copyright 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {MatrixClientPeg} from "../MatrixClientPeg";
+import {IMediaEventContent, IPreparedMedia, prepEventContentAsMedia} from "./models/IMediaEventContent";
+
+// Populate this class with the details of your customisations when copying it.
+
+// Implementation note: The Media class must complete the contract as shown here, though
+// the constructor can be whatever is relevant to your implementation. The mediaForX
+// functions below create an instance of the Media class and are used throughout the
+// project.
+
+/**
+ * A media object is a representation of a "source media" and an optional
+ * "thumbnail media", derived from event contents or external sources.
+ */
+export class Media {
+    // Per above, this constructor signature can be whatever is helpful for you.
+    constructor(private prepared: IPreparedMedia) {
+    }
+
+    /**
+     * The MXC URI of the source media.
+     */
+    public get srcMxc(): string {
+        return this.prepared.mxc;
+    }
+
+    /**
+     * The MXC URI of the thumbnail media, if a thumbnail is recorded. Null/undefined
+     * otherwise.
+     */
+    public get thumbnailMxc(): string | undefined | null {
+        return this.prepared.thumbnail?.mxc;
+    }
+
+    /**
+     * Whether or not a thumbnail is recorded for this media.
+     */
+    public get hasThumbnail(): boolean {
+        return !!this.thumbnailMxc;
+    }
+
+    /**
+     * The HTTP URL for the source media.
+     */
+    public get srcHttp(): string {
+        return MatrixClientPeg.get().mxcUrlToHttp(this.srcMxc);
+    }
+
+    /**
+     * Gets the HTTP URL for the thumbnail media with the requested characteristics, if a thumbnail
+     * is recorded for this media. Returns null/undefined otherwise.
+     * @param {number} width The desired width of the thumbnail.
+     * @param {number} height The desired height of the thumbnail.
+     * @param {"scale"|"crop"} mode The desired thumbnailing mode. Defaults to scale.
+     * @returns {string} The HTTP URL which points to the thumbnail.
+     */
+    public getThumbnailHttp(width: number, height: number, mode: 'scale' | 'crop' = "scale"): string | null | undefined {
+        if (!this.hasThumbnail) return null;
+        return MatrixClientPeg.get().mxcUrlToHttp(this.thumbnailMxc, width, height, mode);
+    }
+
+    /**
+     * Gets the HTTP URL for a thumbnail of the source media with the requested characteristics.
+     * @param {number} width The desired width of the thumbnail.
+     * @param {number} height The desired height of the thumbnail.
+     * @param {"scale"|"crop"} mode The desired thumbnailing mode. Defaults to scale.
+     * @returns {string} The HTTP URL which points to the thumbnail.
+     */
+    public getThumbnailOfSourceHttp(width: number, height: number, mode: 'scale' | 'crop' = "scale"): string {
+        return MatrixClientPeg.get().mxcUrlToHttp(this.srcMxc, width, height, mode);
+    }
+
+    /**
+     * Downloads the source media.
+     * @returns {Promise<Response>} Resolves to the server's response for chaining.
+     */
+    public downloadSource(): Promise<Response> {
+        return fetch(this.srcHttp);
+    }
+
+    /**
+     * Downloads the thumbnail media with the requested characteristics. If no thumbnail media is present,
+     * this throws an exception.
+     * @param {number} width The desired width of the thumbnail.
+     * @param {number} height The desired height of the thumbnail.
+     * @param {"scale"|"crop"} mode The desired thumbnailing mode. Defaults to scale.
+     * @returns {Promise<Response>} Resolves to the server's response for chaining.
+     */
+    public downloadThumbnail(width: number, height: number, mode: 'scale' | 'crop' = "scale"): Promise<Response> {
+        if (!this.hasThumbnail) throw new Error("Cannot download non-existent thumbnail");
+        return fetch(this.getThumbnailHttp(width, height, mode));
+    }
+
+    /**
+     * Downloads a thumbnail of the source media with the requested characteristics.
+     * @param {number} width The desired width of the thumbnail.
+     * @param {number} height The desired height of the thumbnail.
+     * @param {"scale"|"crop"} mode The desired thumbnailing mode. Defaults to scale.
+     * @returns {Promise<Response>} Resolves to the server's response for chaining.
+     */
+    public downloadThumbnailOfSource(width: number, height: number, mode: 'scale' | 'crop' = "scale"): Promise<Response> {
+        return fetch(this.getThumbnailOfSourceHttp(width, height, mode));
+    }
+}
+
+/**
+ * Creates a media object from event content.
+ * @param {IMediaEventContent} content The event content.
+ * @returns {Media} The media object.
+ */
+export function mediaFromContent(content: IMediaEventContent): Media {
+    return new Media(prepEventContentAsMedia(content));
+}
+
+/**
+ * Creates a media object from an MXC URI.
+ * @param {string} mxc The MXC URI.
+ * @returns {Media} The media object.
+ */
+export function mediaFromMxc(mxc: string): Media {
+    return mediaFromContent({url: mxc});
+}
diff --git a/src/customisations/models/IMediaEventContent.ts b/src/customisations/models/IMediaEventContent.ts
new file mode 100644
index 0000000000..0211a63787
--- /dev/null
+++ b/src/customisations/models/IMediaEventContent.ts
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2021 The Matrix.org Foundation C.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.
+ */
+
+// TODO: These types should be elsewhere.
+
+export interface IEncryptedFile {
+    url: string;
+    key: {
+        alg: string;
+        key_ops: string[];
+        kty: string;
+        k: string;
+        ext: boolean;
+    };
+    iv: string;
+    hashes: {[alg: string]: string};
+    v: string;
+}
+
+export interface IMediaEventContent {
+    url?: string; // required on unencrypted media
+    file?: IEncryptedFile; // required for *encrypted* media
+    info?: {
+        thumbnail_url?: string;
+        thumbnail_file?: IEncryptedFile;
+    };
+}
+
+export interface IPreparedMedia extends IMediaObject {
+    thumbnail?: IMediaObject;
+}
+
+export interface IMediaObject {
+    mxc: string;
+    file?: IEncryptedFile;
+}
+
+/**
+ * Parses an event content body into a prepared media object. This prepared media object
+ * can be used with other functions to manipulate the media.
+ * @param {IMediaEventContent} content Unredacted media event content. See interface.
+ * @returns {IPreparedMedia} A prepared media object.
+ * @throws Throws if the given content cannot be packaged into a prepared media object.
+ */
+export function prepEventContentAsMedia(content: IMediaEventContent): IPreparedMedia {
+    let thumbnail: IMediaObject = null;
+    if (content?.info?.thumbnail_url) {
+        thumbnail = {
+            mxc: content.info.thumbnail_url,
+            file: content.info.thumbnail_file,
+        };
+    } else if (content?.info?.thumbnail_file?.url) {
+        thumbnail = {
+            mxc: content.info.thumbnail_file.url,
+            file: content.info.thumbnail_file,
+        };
+    }
+
+    if (content?.url) {
+        return {
+            thumbnail,
+            mxc: content.url,
+            file: content.file,
+        };
+    } else if (content?.file?.url) {
+        return {
+            thumbnail,
+            mxc: content.file.url,
+            file: content.file,
+        };
+    }
+
+    throw new Error("Invalid file provided: cannot determine MXC URI. Has it been redacted?");
+}
diff --git a/src/utils/DecryptFile.js b/src/utils/DecryptFile.js
index d3625d614a..fb3600cd79 100644
--- a/src/utils/DecryptFile.js
+++ b/src/utils/DecryptFile.js
@@ -19,6 +19,7 @@ limitations under the License.
 import encrypt from 'browser-encrypt-attachment';
 // Grab the client so that we can turn mxc:// URLs into https:// URLS.
 import {MatrixClientPeg} from '../MatrixClientPeg';
+import {mediaFromContent} from "../customisations/Media";
 
 // WARNING: We have to be very careful about what mime-types we allow into blobs,
 // as for performance reasons these are now rendered via URL.createObjectURL()
@@ -87,9 +88,9 @@ const ALLOWED_BLOB_MIMETYPES = {
  * @returns {Promise}
  */
 export function decryptFile(file) {
-    const url = MatrixClientPeg.get().mxcUrlToHttp(file.url);
+    const media = mediaFromContent({file});
     // Download the encrypted file as an array buffer.
-    return Promise.resolve(fetch(url)).then(function(response) {
+    return media.downloadSource().then(function(response) {
         return response.arrayBuffer();
     }).then(function(responseData) {
         // Decrypt the array buffer using the information taken from

From 53935782bcaa51daab0011ff16236943e994f153 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 3 Mar 2021 18:22:57 -0700
Subject: [PATCH 255/420] Convert DecryptFile to TS and modernize a bit

---
 .../models/IMediaEventContent.ts              |  1 +
 src/utils/{DecryptFile.js => DecryptFile.ts}  | 63 +++++++++----------
 2 files changed, 30 insertions(+), 34 deletions(-)
 rename src/utils/{DecryptFile.js => DecryptFile.ts} (76%)

diff --git a/src/customisations/models/IMediaEventContent.ts b/src/customisations/models/IMediaEventContent.ts
index 0211a63787..4cbe07dbd5 100644
--- a/src/customisations/models/IMediaEventContent.ts
+++ b/src/customisations/models/IMediaEventContent.ts
@@ -18,6 +18,7 @@
 
 export interface IEncryptedFile {
     url: string;
+    mimetype?: string;
     key: {
         alg: string;
         key_ops: string[];
diff --git a/src/utils/DecryptFile.js b/src/utils/DecryptFile.ts
similarity index 76%
rename from src/utils/DecryptFile.js
rename to src/utils/DecryptFile.ts
index fb3600cd79..93cedbc707 100644
--- a/src/utils/DecryptFile.js
+++ b/src/utils/DecryptFile.ts
@@ -1,6 +1,5 @@
 /*
-Copyright 2016 OpenMarket Ltd
-Copyright 2018 New Vector Ltd
+Copyright 2016, 2018, 2021 The Matrix.org Foundation C.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,9 +16,8 @@ limitations under the License.
 
 // Pull in the encryption lib so that we can decrypt attachments.
 import encrypt from 'browser-encrypt-attachment';
-// Grab the client so that we can turn mxc:// URLs into https:// URLS.
-import {MatrixClientPeg} from '../MatrixClientPeg';
 import {mediaFromContent} from "../customisations/Media";
+import {IEncryptedFile} from "../customisations/models/IMediaEventContent";
 
 // WARNING: We have to be very careful about what mime-types we allow into blobs,
 // as for performance reasons these are now rendered via URL.createObjectURL()
@@ -55,48 +53,46 @@ import {mediaFromContent} from "../customisations/Media";
 // For the record, mime-types which must NEVER enter this list below include:
 //   text/html, text/xhtml, image/svg, image/svg+xml, image/pdf, and similar.
 
-const ALLOWED_BLOB_MIMETYPES = {
-    'image/jpeg': true,
-    'image/gif': true,
-    'image/png': true,
+const ALLOWED_BLOB_MIMETYPES = [
+    'image/jpeg',
+    'image/gif',
+    'image/png',
 
-    'video/mp4': true,
-    'video/webm': true,
-    'video/ogg': true,
+    'video/mp4',
+    'video/webm',
+    'video/ogg',
 
-    'audio/mp4': true,
-    'audio/webm': true,
-    'audio/aac': true,
-    'audio/mpeg': true,
-    'audio/ogg': true,
-    'audio/wave': true,
-    'audio/wav': true,
-    'audio/x-wav': true,
-    'audio/x-pn-wav': true,
-    'audio/flac': true,
-    'audio/x-flac': true,
-};
+    'audio/mp4',
+    'audio/webm',
+    'audio/aac',
+    'audio/mpeg',
+    'audio/ogg',
+    'audio/wave',
+    'audio/wav',
+    'audio/x-wav',
+    'audio/x-pn-wav',
+    'audio/flac',
+    'audio/x-flac',
+];
 
 /**
  * Decrypt a file attached to a matrix event.
- * @param {Object} file The json taken from the matrix event.
+ * @param {IEncryptedFile} file The json taken from the matrix event.
  *   This passed to [link]{@link https://github.com/matrix-org/browser-encrypt-attachments}
  *   as the encryption info object, so will also have the those keys in addition to
  *   the keys below.
- * @param {string} file.url An mxc:// URL for the encrypted file.
- * @param {string} file.mimetype The MIME-type of the plaintext file.
- * @returns {Promise}
+ * @returns {Promise<Blob>} Resolves to a Blob of the file.
  */
-export function decryptFile(file) {
+export function decryptFile(file: IEncryptedFile): Promise<Blob> {
     const media = mediaFromContent({file});
     // Download the encrypted file as an array buffer.
-    return media.downloadSource().then(function(response) {
+    return media.downloadSource().then((response) => {
         return response.arrayBuffer();
-    }).then(function(responseData) {
+    }).then((responseData) => {
         // Decrypt the array buffer using the information taken from
         // the event content.
         return encrypt.decryptAttachment(responseData, file);
-    }).then(function(dataArray) {
+    }).then((dataArray) => {
         // Turn the array into a Blob and give it the correct MIME-type.
 
         // IMPORTANT: we must not allow scriptable mime-types into Blobs otherwise
@@ -104,11 +100,10 @@ export function decryptFile(file) {
         // browser (e.g. by copying the URI into a new tab or window.)
         // See warning at top of file.
         let mimetype = file.mimetype ? file.mimetype.split(";")[0].trim() : '';
-        if (!ALLOWED_BLOB_MIMETYPES[mimetype]) {
+        if (!ALLOWED_BLOB_MIMETYPES.includes(mimetype)) {
             mimetype = 'application/octet-stream';
         }
 
-        const blob = new Blob([dataArray], {type: mimetype});
-        return blob;
+        return new Blob([dataArray], {type: mimetype});
     });
 }

From 1ac12479ca7b132b9d9d4eddc64ed6aa9b7fbde0 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 3 Mar 2021 19:06:46 -0700
Subject: [PATCH 256/420] Convert cases of mxcUrlToHttp to new media
 customisation

---
 src/HtmlUtils.tsx                             |  9 ++---
 src/Notifier.ts                               |  3 +-
 src/autocomplete/CommunityProvider.tsx        |  3 +-
 src/components/structures/GroupView.js        | 11 +++---
 src/components/structures/LeftPanel.tsx       |  3 +-
 .../structures/SpaceRoomDirectory.tsx         | 15 ++------
 src/components/views/avatars/GroupAvatar.tsx  |  9 +++--
 .../views/dialogs/ConfirmUserActionDialog.js  |  6 ++-
 .../dialogs/EditCommunityPrototypeDialog.tsx  |  3 +-
 .../views/dialogs/IncomingSasDialog.js        | 20 +++++-----
 src/components/views/elements/AddressTile.js  |  5 +--
 src/components/views/elements/Flair.js        |  4 +-
 src/components/views/elements/Pill.js         |  3 +-
 src/components/views/elements/SSOButtons.tsx  |  3 +-
 src/components/views/elements/TagTile.js      | 13 ++++---
 .../views/groups/GroupInviteTile.js           |  6 ++-
 .../views/groups/GroupMemberTile.js           |  8 ++--
 src/components/views/groups/GroupRoomInfo.js  |  7 ++--
 src/components/views/groups/GroupRoomTile.js  |  8 ++--
 src/components/views/groups/GroupTile.js      |  6 ++-
 src/components/views/messages/MAudioBody.js   |  7 ++--
 src/components/views/messages/MFileBody.js    |  5 ++-
 src/components/views/messages/MImageBody.js   | 36 +++++++-----------
 src/components/views/messages/MVideoBody.tsx  | 14 ++++---
 .../views/messages/RoomAvatarEvent.js         |  3 +-
 src/components/views/right_panel/UserInfo.tsx |  3 +-
 .../room_settings/RoomProfileSettings.js      |  5 ++-
 .../views/rooms/LinkPreviewWidget.js          |  9 +++--
 src/components/views/settings/ChangeAvatar.js |  3 +-
 .../views/settings/ProfileSettings.js         |  5 ++-
 src/customisations/Media.ts                   | 38 +++++++++++++++++--
 src/customisations/models/ResizeMode.ts       | 17 +++++++++
 src/stores/OwnProfileStore.ts                 |  9 ++++-
 33 files changed, 178 insertions(+), 121 deletions(-)
 create mode 100644 src/customisations/models/ResizeMode.ts

diff --git a/src/HtmlUtils.tsx b/src/HtmlUtils.tsx
index 7d6b049914..12752eb20f 100644
--- a/src/HtmlUtils.tsx
+++ b/src/HtmlUtils.tsx
@@ -36,6 +36,7 @@ import {MatrixClientPeg} from './MatrixClientPeg';
 import {tryTransformPermalinkToLocalHref} from "./utils/permalinks/Permalinks";
 import {SHORTCODE_TO_EMOJI, getEmojiFromUnicode} from "./emoji";
 import ReplyThread from "./components/views/elements/ReplyThread";
+import {mediaFromMxc} from "./customisations/Media";
 
 linkifyMatrix(linkify);
 
@@ -181,11 +182,9 @@ const transformTags: IExtendedSanitizeOptions["transformTags"] = { // custom to
         if (!attribs.src || !attribs.src.startsWith('mxc://') || !SettingsStore.getValue("showImages")) {
             return { tagName, attribs: {}};
         }
-        attribs.src = MatrixClientPeg.get().mxcUrlToHttp(
-            attribs.src,
-            attribs.width || 800,
-            attribs.height || 600,
-        );
+        const width = Number(attribs.width) || 800;
+        const height = Number(attribs.height) || 600;
+        attribs.src = mediaFromMxc(attribs.src).getThumbnailOfSourceHttp(width, height);
         return { tagName, attribs };
     },
     'code': function(tagName: string, attribs: sanitizeHtml.Attributes) {
diff --git a/src/Notifier.ts b/src/Notifier.ts
index 6460be20ad..f68bfabc18 100644
--- a/src/Notifier.ts
+++ b/src/Notifier.ts
@@ -36,6 +36,7 @@ import {SettingLevel} from "./settings/SettingLevel";
 import {isPushNotifyDisabled} from "./settings/controllers/NotificationControllers";
 import RoomViewStore from "./stores/RoomViewStore";
 import UserActivity from "./UserActivity";
+import {mediaFromMxc} from "./customisations/Media";
 
 /*
  * Dispatches:
@@ -150,7 +151,7 @@ export const Notifier = {
         // Ideally in here we could use MSC1310 to detect the type of file, and reject it.
 
         return {
-            url: MatrixClientPeg.get().mxcUrlToHttp(content.url),
+            url: mediaFromMxc(content.url).srcHttp,
             name: content.name,
             type: content.type,
             size: content.size,
diff --git a/src/autocomplete/CommunityProvider.tsx b/src/autocomplete/CommunityProvider.tsx
index ebf5d536ec..b7a4e0960e 100644
--- a/src/autocomplete/CommunityProvider.tsx
+++ b/src/autocomplete/CommunityProvider.tsx
@@ -27,6 +27,7 @@ import {sortBy} from "lodash";
 import {makeGroupPermalink} from "../utils/permalinks/Permalinks";
 import {ICompletion, ISelectionRange} from "./Autocompleter";
 import FlairStore from "../stores/FlairStore";
+import {mediaFromMxc} from "../customisations/Media";
 
 const COMMUNITY_REGEX = /\B\+\S*/g;
 
@@ -95,7 +96,7 @@ export default class CommunityProvider extends AutocompleteProvider {
                             name={name || groupId}
                             width={24}
                             height={24}
-                            url={avatarUrl ? cli.mxcUrlToHttp(avatarUrl, 24, 24) : null} />
+                            url={avatarUrl ? mediaFromMxc(avatarUrl).getSquareThumbnailHttp(24) : null} />
                     </PillCompletion>
                 ),
                 range,
diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index b4b871a0b4..f05d8d0758 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -39,6 +39,7 @@ import {Group} from "matrix-js-sdk";
 import {allSettled, sleep} from "../../utils/promise";
 import RightPanelStore from "../../stores/RightPanelStore";
 import AutoHideScrollbar from "./AutoHideScrollbar";
+import {mediaFromMxc} from "../../customisations/Media";
 import {replaceableComponent} from "../../utils/replaceableComponent";
 
 const LONG_DESC_PLACEHOLDER = _td(
@@ -368,8 +369,7 @@ class FeaturedUser extends React.Component {
 
         const permalink = makeUserPermalink(this.props.summaryInfo.user_id);
         const userNameNode = <a href={permalink} onClick={this.onClick}>{ name }</a>;
-        const httpUrl = MatrixClientPeg.get()
-            .mxcUrlToHttp(this.props.summaryInfo.avatar_url, 64, 64);
+        const httpUrl = mediaFromMxc(this.props.summaryInfo.avatar_url).getSquareThumbnailHttp(64);
 
         const deleteButton = this.props.editing ?
             <img
@@ -981,10 +981,9 @@ export default class GroupView extends React.Component {
                     <Spinner />
                 </div>;
             }
-            const httpInviterAvatar = this.state.inviterProfile ?
-                this._matrixClient.mxcUrlToHttp(
-                    this.state.inviterProfile.avatarUrl, 36, 36,
-                ) : null;
+            const httpInviterAvatar = this.state.inviterProfile
+                ? mediaFromMxc(this.state.inviterProfile.avatarUrl).getSquareThumbnailHttp(36)
+                : null;
 
             const inviter = group.inviter || {};
             let inviterName = inviter.userId;
diff --git a/src/components/structures/LeftPanel.tsx b/src/components/structures/LeftPanel.tsx
index 88c7a71b35..f7865d094a 100644
--- a/src/components/structures/LeftPanel.tsx
+++ b/src/components/structures/LeftPanel.tsx
@@ -41,6 +41,7 @@ import RoomListNumResults from "../views/rooms/RoomListNumResults";
 import LeftPanelWidget from "./LeftPanelWidget";
 import SpacePanel from "../views/spaces/SpacePanel";
 import {replaceableComponent} from "../../utils/replaceableComponent";
+import {mediaFromMxc} from "../../customisations/Media";
 
 interface IProps {
     isMinimized: boolean;
@@ -121,7 +122,7 @@ export default class LeftPanel extends React.Component<IProps, IState> {
         let avatarUrl = OwnProfileStore.instance.getHttpAvatarUrl(avatarSize);
         const settingBgMxc = SettingsStore.getValue("RoomList.backgroundImage");
         if (settingBgMxc) {
-            avatarUrl = MatrixClientPeg.get().mxcUrlToHttp(settingBgMxc, avatarSize, avatarSize);
+            avatarUrl = mediaFromMxc(settingBgMxc).getSquareThumbnailHttp(avatarSize);
         }
 
         const avatarUrlProp = `url(${avatarUrl})`;
diff --git a/src/components/structures/SpaceRoomDirectory.tsx b/src/components/structures/SpaceRoomDirectory.tsx
index 72e52678b6..9ee16558d3 100644
--- a/src/components/structures/SpaceRoomDirectory.tsx
+++ b/src/components/structures/SpaceRoomDirectory.tsx
@@ -34,6 +34,7 @@ import {EnhancedMap} from "../../utils/maps";
 import StyledCheckbox from "../views/elements/StyledCheckbox";
 import AutoHideScrollbar from "./AutoHideScrollbar";
 import BaseAvatar from "../views/avatars/BaseAvatar";
+import {mediaFromMxc} from "../../customisations/Media";
 
 interface IProps {
     space: Room;
@@ -158,12 +159,7 @@ const SubSpace: React.FC<ISubspaceProps> = ({
 
     let url: string;
     if (space.avatar_url) {
-        url = MatrixClientPeg.get().mxcUrlToHttp(
-            space.avatar_url,
-            Math.floor(24 * window.devicePixelRatio),
-            Math.floor(24 * window.devicePixelRatio),
-            "crop",
-        );
+        url = mediaFromMxc(space.avatar_url).getSquareThumbnailHttp(Math.floor(24 * window.devicePixelRatio));
     }
 
     return <div className="mx_SpaceRoomDirectory_subspace">
@@ -265,12 +261,7 @@ const RoomTile = ({ room, event, editing, queueAction, onPreviewClick, onJoinCli
 
     let url: string;
     if (room.avatar_url) {
-        url = cli.mxcUrlToHttp(
-            room.avatar_url,
-            Math.floor(32 * window.devicePixelRatio),
-            Math.floor(32 * window.devicePixelRatio),
-            "crop",
-        );
+        url = mediaFromMxc(room.avatar_url).getSquareThumbnailHttp(Math.floor(32 * window.devicePixelRatio));
     }
 
     const content = <React.Fragment>
diff --git a/src/components/views/avatars/GroupAvatar.tsx b/src/components/views/avatars/GroupAvatar.tsx
index a033257871..dc363da304 100644
--- a/src/components/views/avatars/GroupAvatar.tsx
+++ b/src/components/views/avatars/GroupAvatar.tsx
@@ -1,5 +1,5 @@
 /*
-Copyright 2017 Vector Creations Ltd
+Copyright 2017, 2021 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -18,6 +18,8 @@ import React from 'react';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import BaseAvatar from './BaseAvatar';
 import {replaceableComponent} from "../../../utils/replaceableComponent";
+import {mediaFromMxc} from "../../../customisations/Media";
+import {ResizeMode} from "../../../customisations/models/ResizeMode";
 
 export interface IProps {
         groupId?: string;
@@ -25,7 +27,7 @@ export interface IProps {
         groupAvatarUrl?: string;
         width?: number;
         height?: number;
-        resizeMethod?: string;
+        resizeMethod?: ResizeMode;
         onClick?: React.MouseEventHandler;
 }
 
@@ -38,8 +40,7 @@ export default class GroupAvatar extends React.Component<IProps> {
     };
 
     getGroupAvatarUrl() {
-        return MatrixClientPeg.get().mxcUrlToHttp(
-            this.props.groupAvatarUrl,
+        return mediaFromMxc(this.props.groupAvatarUrl).getThumbnailOfSourceHttp(
             this.props.width,
             this.props.height,
             this.props.resizeMethod,
diff --git a/src/components/views/dialogs/ConfirmUserActionDialog.js b/src/components/views/dialogs/ConfirmUserActionDialog.js
index 8827f161f1..8cfd28986b 100644
--- a/src/components/views/dialogs/ConfirmUserActionDialog.js
+++ b/src/components/views/dialogs/ConfirmUserActionDialog.js
@@ -21,6 +21,7 @@ import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import { GroupMemberType } from '../../../groups';
 import {replaceableComponent} from "../../../utils/replaceableComponent";
+import {mediaFromMxc} from "../../../customisations/Media";
 
 /*
  * A dialog for confirming an operation on another user.
@@ -108,8 +109,9 @@ export default class ConfirmUserActionDialog extends React.Component {
             name = this.props.member.name;
             userId = this.props.member.userId;
         } else {
-            const httpAvatarUrl = this.props.groupMember.avatarUrl ?
-                this.props.matrixClient.mxcUrlToHttp(this.props.groupMember.avatarUrl, 48, 48) : null;
+            const httpAvatarUrl = this.props.groupMember.avatarUrl
+                ? mediaFromMxc(this.props.groupMember.avatarUrl).getSquareThumbnailHttp(48)
+                : null;
             name = this.props.groupMember.displayname || this.props.groupMember.userId;
             userId = this.props.groupMember.userId;
             avatar = <BaseAvatar name={name} url={httpAvatarUrl} width={48} height={48} />;
diff --git a/src/components/views/dialogs/EditCommunityPrototypeDialog.tsx b/src/components/views/dialogs/EditCommunityPrototypeDialog.tsx
index 504d563bd9..ee3696b427 100644
--- a/src/components/views/dialogs/EditCommunityPrototypeDialog.tsx
+++ b/src/components/views/dialogs/EditCommunityPrototypeDialog.tsx
@@ -24,6 +24,7 @@ import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import { CommunityPrototypeStore } from "../../../stores/CommunityPrototypeStore";
 import FlairStore from "../../../stores/FlairStore";
 import {replaceableComponent} from "../../../utils/replaceableComponent";
+import {mediaFromMxc} from "../../../customisations/Media";
 
 interface IProps extends IDialogProps {
     communityId: string;
@@ -118,7 +119,7 @@ export default class EditCommunityPrototypeDialog extends React.PureComponent<IP
         let preview = <img src={this.state.avatarPreview} className="mx_EditCommunityPrototypeDialog_avatar" />;
         if (!this.state.avatarPreview) {
             if (this.state.currentAvatarUrl) {
-                const url = MatrixClientPeg.get().mxcUrlToHttp(this.state.currentAvatarUrl);
+                const url = mediaFromMxc(this.state.currentAvatarUrl).srcHttp;
                 preview = <img src={url} className="mx_EditCommunityPrototypeDialog_avatar" />;
             } else {
                 preview = <div className="mx_EditCommunityPrototypeDialog_placeholderAvatar" />
diff --git a/src/components/views/dialogs/IncomingSasDialog.js b/src/components/views/dialogs/IncomingSasDialog.js
index d65ec7563f..f18b7a9d0c 100644
--- a/src/components/views/dialogs/IncomingSasDialog.js
+++ b/src/components/views/dialogs/IncomingSasDialog.js
@@ -20,6 +20,7 @@ import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import {replaceableComponent} from "../../../utils/replaceableComponent";
+import {mediaFromMxc} from "../../../customisations/Media";
 
 const PHASE_START = 0;
 const PHASE_SHOW_SAS = 1;
@@ -123,22 +124,21 @@ export default class IncomingSasDialog extends React.Component {
         const Spinner = sdk.getComponent("views.elements.Spinner");
         const BaseAvatar = sdk.getComponent("avatars.BaseAvatar");
 
-        const isSelf = this.props.verifier.userId == MatrixClientPeg.get().getUserId();
+        const isSelf = this.props.verifier.userId === MatrixClientPeg.get().getUserId();
 
         let profile;
-        if (this.state.opponentProfile) {
+        const oppProfile = this.state.opponentProfile;
+        if (oppProfile) {
+            const url = oppProfile.avatar_url
+                ? mediaFromMxc(oppProfile.avatar_url).getSquareThumbnailHttp(Math.floor(48 * window.devicePixelRatio))
+                : null;
             profile = <div className="mx_IncomingSasDialog_opponentProfile">
-                <BaseAvatar name={this.state.opponentProfile.displayname}
+                <BaseAvatar name={oppProfile.displayname}
                     idName={this.props.verifier.userId}
-                    url={MatrixClientPeg.get().mxcUrlToHttp(
-                        this.state.opponentProfile.avatar_url,
-                        Math.floor(48 * window.devicePixelRatio),
-                        Math.floor(48 * window.devicePixelRatio),
-                        'crop',
-                    )}
+                    url={url}
                     width={48} height={48} resizeMethod='crop'
                 />
-                <h2>{this.state.opponentProfile.displayname}</h2>
+                <h2>{oppProfile.displayname}</h2>
             </div>;
         } else if (this.state.opponentProfileError) {
             profile = <div>
diff --git a/src/components/views/elements/AddressTile.js b/src/components/views/elements/AddressTile.js
index 4a216dbae4..4f5ee45a3c 100644
--- a/src/components/views/elements/AddressTile.js
+++ b/src/components/views/elements/AddressTile.js
@@ -23,6 +23,7 @@ import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import { _t } from '../../../languageHandler';
 import { UserAddressType } from '../../../UserAddress.js';
 import {replaceableComponent} from "../../../utils/replaceableComponent";
+import {mediaFromMxc} from "../../../customisations/Media";
 
 @replaceableComponent("views.elements.AddressTile")
 export default class AddressTile extends React.Component {
@@ -47,9 +48,7 @@ export default class AddressTile extends React.Component {
         const isMatrixAddress = ['mx-user-id', 'mx-room-id'].includes(address.addressType);
 
         if (isMatrixAddress && address.avatarMxc) {
-            imgUrls.push(MatrixClientPeg.get().mxcUrlToHttp(
-                address.avatarMxc, 25, 25, 'crop',
-            ));
+            imgUrls.push(mediaFromMxc(address.avatarMxc).getSquareThumbnailHttp(25));
         } else if (address.addressType === 'email') {
             imgUrls.push(require("../../../../res/img/icon-email-user.svg"));
         }
diff --git a/src/components/views/elements/Flair.js b/src/components/views/elements/Flair.js
index 75998cb721..73d5b91511 100644
--- a/src/components/views/elements/Flair.js
+++ b/src/components/views/elements/Flair.js
@@ -20,6 +20,7 @@ import FlairStore from '../../../stores/FlairStore';
 import dis from '../../../dispatcher/dispatcher';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import {replaceableComponent} from "../../../utils/replaceableComponent";
+import {mediaFromMxc} from "../../../customisations/Media";
 
 
 class FlairAvatar extends React.Component {
@@ -39,8 +40,7 @@ class FlairAvatar extends React.Component {
     }
 
     render() {
-        const httpUrl = this.context.mxcUrlToHttp(
-            this.props.groupProfile.avatarUrl, 16, 16, 'scale', false);
+        const httpUrl = mediaFromMxc(this.props.groupProfile.avatarUrl).getSquareThumbnailHttp(16);
         const tooltip = this.props.groupProfile.name ?
             `${this.props.groupProfile.name} (${this.props.groupProfile.groupId})`:
             this.props.groupProfile.groupId;
diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js
index b0d4fc7fa2..bf99ee6078 100644
--- a/src/components/views/elements/Pill.js
+++ b/src/components/views/elements/Pill.js
@@ -26,6 +26,7 @@ import FlairStore from "../../../stores/FlairStore";
 import {getPrimaryPermalinkEntity, parseAppLocalLink} from "../../../utils/permalinks/Permalinks";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import {Action} from "../../../dispatcher/actions";
+import {mediaFromMxc} from "../../../customisations/Media";
 import Tooltip from './Tooltip';
 import {replaceableComponent} from "../../../utils/replaceableComponent";
 
@@ -259,7 +260,7 @@ class Pill extends React.Component {
                     linkText = groupId;
                     if (this.props.shouldShowPillAvatar) {
                         avatar = <BaseAvatar name={name || groupId} width={16} height={16} aria-hidden="true"
-                                             url={avatarUrl ? cli.mxcUrlToHttp(avatarUrl, 16, 16) : null} />;
+                                             url={avatarUrl ? mediaFromMxc(avatarUrl).getSquareThumbnailHttp(16) : null} />;
                     }
                     pillClass = 'mx_GroupPill';
                 }
diff --git a/src/components/views/elements/SSOButtons.tsx b/src/components/views/elements/SSOButtons.tsx
index 3a03252ebd..4e41db0ae7 100644
--- a/src/components/views/elements/SSOButtons.tsx
+++ b/src/components/views/elements/SSOButtons.tsx
@@ -24,6 +24,7 @@ import AccessibleButton from "./AccessibleButton";
 import {_t} from "../../../languageHandler";
 import {IdentityProviderBrand, IIdentityProvider, ISSOFlow} from "../../../Login";
 import AccessibleTooltipButton from "./AccessibleTooltipButton";
+import {mediaFromMxc} from "../../../customisations/Media";
 
 interface ISSOButtonProps extends Omit<IProps, "flow"> {
     idp: IIdentityProvider;
@@ -72,7 +73,7 @@ const SSOButton: React.FC<ISSOButtonProps> = ({
         brandClass = `mx_SSOButton_brand_${brandName}`;
         icon = <img src={brandIcon} height="24" width="24" alt={brandName} />;
     } else if (typeof idp?.icon === "string" && idp.icon.startsWith("mxc://")) {
-        const src = matrixClient.mxcUrlToHttp(idp.icon, 24, 24, "crop", true);
+        const src = mediaFromMxc(idp.icon).getSquareThumbnailHttp(24);
         icon = <img src={src} height="24" width="24" alt={idp.name} />;
     }
 
diff --git a/src/components/views/elements/TagTile.js b/src/components/views/elements/TagTile.js
index 663acd6329..03d853babc 100644
--- a/src/components/views/elements/TagTile.js
+++ b/src/components/views/elements/TagTile.js
@@ -30,6 +30,7 @@ import GroupFilterOrderStore from '../../../stores/GroupFilterOrderStore';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import AccessibleButton from "./AccessibleButton";
 import SettingsStore from "../../../settings/SettingsStore";
+import {mediaFromMxc} from "../../../customisations/Media";
 import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 // A class for a child of GroupFilterPanel (possibly wrapped in a DNDTagTile) that represents
@@ -130,11 +131,11 @@ export default class TagTile extends React.Component {
         const BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
         const profile = this.state.profile || {};
         const name = profile.name || this.props.tag;
-        const avatarHeight = 32;
+        const avatarSize = 32;
 
-        const httpUrl = profile.avatarUrl ? this.context.mxcUrlToHttp(
-            profile.avatarUrl, avatarHeight, avatarHeight, "crop",
-        ) : null;
+        const httpUrl = profile.avatarUrl
+            ? mediaFromMxc(profile.avatarUrl).getSquareThumbnailHttp(avatarSize)
+            : null;
 
         const isPrototype = SettingsStore.getValue("feature_communities_v2_prototypes");
         const className = classNames({
@@ -180,8 +181,8 @@ export default class TagTile extends React.Component {
                     name={name}
                     idName={this.props.tag}
                     url={httpUrl}
-                    width={avatarHeight}
-                    height={avatarHeight}
+                    width={avatarSize}
+                    height={avatarSize}
                 />
                 {contextButton}
                 {badgeElement}
diff --git a/src/components/views/groups/GroupInviteTile.js b/src/components/views/groups/GroupInviteTile.js
index dc48c01acb..bc0bf966f9 100644
--- a/src/components/views/groups/GroupInviteTile.js
+++ b/src/components/views/groups/GroupInviteTile.js
@@ -27,6 +27,7 @@ import {ContextMenu, ContextMenuButton, toRightOf} from "../../structures/Contex
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import {RovingTabIndexWrapper} from "../../../accessibility/RovingTabIndex";
 import {replaceableComponent} from "../../../utils/replaceableComponent";
+import {mediaFromMxc} from "../../../customisations/Media";
 
 // XXX this class copies a lot from RoomTile.js
 @replaceableComponent("views.groups.GroupInviteTile")
@@ -117,8 +118,9 @@ export default class GroupInviteTile extends React.Component {
         const BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
 
         const groupName = this.props.group.name || this.props.group.groupId;
-        const httpAvatarUrl = this.props.group.avatarUrl ?
-            this.context.mxcUrlToHttp(this.props.group.avatarUrl, 24, 24) : null;
+        const httpAvatarUrl = this.props.group.avatarUrl
+            ? mediaFromMxc(this.props.group.avatarUrl).getSquareThumbnailHttp(24)
+            : null;
 
         const av = <BaseAvatar name={groupName} width={24} height={24} url={httpAvatarUrl} />;
 
diff --git a/src/components/views/groups/GroupMemberTile.js b/src/components/views/groups/GroupMemberTile.js
index e8285803b0..a436f2403e 100644
--- a/src/components/views/groups/GroupMemberTile.js
+++ b/src/components/views/groups/GroupMemberTile.js
@@ -23,6 +23,7 @@ import dis from '../../../dispatcher/dispatcher';
 import { GroupMemberType } from '../../../groups';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import {replaceableComponent} from "../../../utils/replaceableComponent";
+import {mediaFromMxc} from "../../../customisations/Media";
 
 @replaceableComponent("views.groups.GroupMemberTile")
 export default class GroupMemberTile extends React.Component {
@@ -46,10 +47,9 @@ export default class GroupMemberTile extends React.Component {
         const EntityTile = sdk.getComponent('rooms.EntityTile');
 
         const name = this.props.member.displayname || this.props.member.userId;
-        const avatarUrl = this.context.mxcUrlToHttp(
-            this.props.member.avatarUrl,
-            36, 36, 'crop',
-        );
+        const avatarUrl = this.props.member.avatarUrl
+            ? mediaFromMxc(this.props.member.avatarUrl).getSquareThumbnailHttp(36)
+            : null;
 
         const av = (
             <BaseAvatar
diff --git a/src/components/views/groups/GroupRoomInfo.js b/src/components/views/groups/GroupRoomInfo.js
index 227a17e995..c1d1adb0b3 100644
--- a/src/components/views/groups/GroupRoomInfo.js
+++ b/src/components/views/groups/GroupRoomInfo.js
@@ -25,6 +25,7 @@ import GroupStore from '../../../stores/GroupStore';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
 import {replaceableComponent} from "../../../utils/replaceableComponent";
+import {mediaFromMxc} from "../../../customisations/Media";
 
 @replaceableComponent("views.groups.GroupRoomInfo")
 export default class GroupRoomInfo extends React.Component {
@@ -204,10 +205,8 @@ export default class GroupRoomInfo extends React.Component {
         const avatarUrl = this.state.groupRoom.avatarUrl;
         let avatarElement;
         if (avatarUrl) {
-            const httpUrl = this.context.mxcUrlToHttp(avatarUrl, 800, 800);
-            avatarElement = (<div className="mx_MemberInfo_avatar">
-                            <img src={httpUrl} />
-                        </div>);
+            const httpUrl = mediaFromMxc(avatarUrl).getSquareThumbnailHttp(800);
+            avatarElement = <div className="mx_MemberInfo_avatar"><img src={httpUrl} /></div>;
         }
 
         const groupRoomName = this.state.groupRoom.displayname;
diff --git a/src/components/views/groups/GroupRoomTile.js b/src/components/views/groups/GroupRoomTile.js
index 8b25437f71..7edfc1a376 100644
--- a/src/components/views/groups/GroupRoomTile.js
+++ b/src/components/views/groups/GroupRoomTile.js
@@ -21,6 +21,7 @@ import dis from '../../../dispatcher/dispatcher';
 import { GroupRoomType } from '../../../groups';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import {replaceableComponent} from "../../../utils/replaceableComponent";
+import {mediaFromMxc} from "../../../customisations/Media";
 
 @replaceableComponent("views.groups.GroupRoomTile")
 class GroupRoomTile extends React.Component {
@@ -42,10 +43,9 @@ class GroupRoomTile extends React.Component {
     render() {
         const BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-        const avatarUrl = this.context.mxcUrlToHttp(
-            this.props.groupRoom.avatarUrl,
-            36, 36, 'crop',
-        );
+        const avatarUrl = this.props.groupRoom.avatarUrl
+            ? mediaFromMxc(this.props.groupRoom.avatarUrl).getSquareThumbnailHttp(36)
+            : null;
 
         const av = (
             <BaseAvatar name={this.props.groupRoom.displayname}
diff --git a/src/components/views/groups/GroupTile.js b/src/components/views/groups/GroupTile.js
index bb1714c9f2..42a977fb79 100644
--- a/src/components/views/groups/GroupTile.js
+++ b/src/components/views/groups/GroupTile.js
@@ -22,6 +22,7 @@ import dis from '../../../dispatcher/dispatcher';
 import FlairStore from '../../../stores/FlairStore';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import {replaceableComponent} from "../../../utils/replaceableComponent";
+import {mediaFromMxc} from "../../../customisations/Media";
 
 function nop() {}
 
@@ -73,8 +74,9 @@ class GroupTile extends React.Component {
         const descElement = this.props.showDescription ?
             <div className="mx_GroupTile_desc">{ profile.shortDescription }</div> :
             <div />;
-        const httpUrl = profile.avatarUrl ? this.context.mxcUrlToHttp(
-            profile.avatarUrl, avatarHeight, avatarHeight, "crop") : null;
+        const httpUrl = profile.avatarUrl
+            ? mediaFromMxc(profile.avatarUrl).getSquareThumbnailHttp(avatarHeight)
+            : null;
 
         let avatarElement = (
             <div className="mx_GroupTile_avatar">
diff --git a/src/components/views/messages/MAudioBody.js b/src/components/views/messages/MAudioBody.js
index 498e2db12a..78ded9a514 100644
--- a/src/components/views/messages/MAudioBody.js
+++ b/src/components/views/messages/MAudioBody.js
@@ -22,6 +22,7 @@ import { decryptFile } from '../../../utils/DecryptFile';
 import { _t } from '../../../languageHandler';
 import InlineSpinner from '../elements/InlineSpinner';
 import {replaceableComponent} from "../../../utils/replaceableComponent";
+import {mediaFromContent} from "../../../customisations/Media";
 
 @replaceableComponent("views.messages.MAudioBody")
 export default class MAudioBody extends React.Component {
@@ -41,11 +42,11 @@ export default class MAudioBody extends React.Component {
     }
 
     _getContentUrl() {
-        const content = this.props.mxEvent.getContent();
-        if (content.file !== undefined) {
+        const media = mediaFromContent(this.props.mxEvent.getContent());
+        if (media.isEncrypted) {
             return this.state.decryptedUrl;
         } else {
-            return MatrixClientPeg.get().mxcUrlToHttp(content.url);
+            return media.srcHttp;
         }
     }
 
diff --git a/src/components/views/messages/MFileBody.js b/src/components/views/messages/MFileBody.js
index e9893f99b6..07d7beb793 100644
--- a/src/components/views/messages/MFileBody.js
+++ b/src/components/views/messages/MFileBody.js
@@ -27,6 +27,7 @@ import request from 'browser-request';
 import Modal from '../../../Modal';
 import AccessibleButton from "../elements/AccessibleButton";
 import {replaceableComponent} from "../../../utils/replaceableComponent";
+import {mediaFromContent} from "../../../customisations/Media";
 
 
 // A cached tinted copy of require("../../../../res/img/download.svg")
@@ -178,8 +179,8 @@ export default class MFileBody extends React.Component {
     }
 
     _getContentUrl() {
-        const content = this.props.mxEvent.getContent();
-        return MatrixClientPeg.get().mxcUrlToHttp(content.url);
+        const media = mediaFromContent(this.props.mxEvent.getContent());
+        return media.srcHttp;
     }
 
     componentDidMount() {
diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js
index 59c5b4e66b..0a1f875935 100644
--- a/src/components/views/messages/MImageBody.js
+++ b/src/components/views/messages/MImageBody.js
@@ -28,6 +28,7 @@ import SettingsStore from "../../../settings/SettingsStore";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import InlineSpinner from '../elements/InlineSpinner';
 import {replaceableComponent} from "../../../utils/replaceableComponent";
+import {mediaFromContent} from "../../../customisations/Media";
 
 @replaceableComponent("views.messages.MImageBody")
 export default class MImageBody extends React.Component {
@@ -167,16 +168,16 @@ export default class MImageBody extends React.Component {
     }
 
     _getContentUrl() {
-        const content = this.props.mxEvent.getContent();
-        if (content.file !== undefined) {
+        const media = mediaFromContent(this.props.mxEvent.getContent());
+        if (media.isEncrypted) {
             return this.state.decryptedUrl;
         } else {
-            return this.context.mxcUrlToHttp(content.url);
+            return media.srcHttp;
         }
     }
 
     _getThumbUrl() {
-        // FIXME: the dharma skin lets images grow as wide as you like, rather than capped to 800x600.
+        // FIXME: we let images grow as wide as you like, rather than capped to 800x600.
         // So either we need to support custom timeline widths here, or reimpose the cap, otherwise the
         // thumbnail resolution will be unnecessarily reduced.
         // custom timeline widths seems preferable.
@@ -185,21 +186,19 @@ export default class MImageBody extends React.Component {
         const thumbHeight = Math.round(600 * pixelRatio);
 
         const content = this.props.mxEvent.getContent();
-        if (content.file !== undefined) {
+        const media = mediaFromContent(content);
+
+        if (media.isEncrypted) {
             // Don't use the thumbnail for clients wishing to autoplay gifs.
             if (this.state.decryptedThumbnailUrl) {
                 return this.state.decryptedThumbnailUrl;
             }
             return this.state.decryptedUrl;
-        } else if (content.info && content.info.mimetype === "image/svg+xml" && content.info.thumbnail_url) {
+        } else if (content.info && content.info.mimetype === "image/svg+xml" && media.hasThumbnail) {
             // special case to return clientside sender-generated thumbnails for SVGs, if any,
             // given we deliberately don't thumbnail them serverside to prevent
             // billion lol attacks and similar
-            return this.context.mxcUrlToHttp(
-                content.info.thumbnail_url,
-                thumbWidth,
-                thumbHeight,
-            );
+            return media.getThumbnailHttp(thumbWidth, thumbHeight, 'scale');
         } else {
             // we try to download the correct resolution
             // for hi-res images (like retina screenshots).
@@ -218,7 +217,7 @@ export default class MImageBody extends React.Component {
                 pixelRatio === 1.0 ||
                 (!info || !info.w || !info.h || !info.size)
             ) {
-                return this.context.mxcUrlToHttp(content.url, thumbWidth, thumbHeight);
+                return media.getThumbnailOfSourceHttp(thumbWidth, thumbHeight);
             } else {
                 // we should only request thumbnails if the image is bigger than 800x600
                 // (or 1600x1200 on retina) otherwise the image in the timeline will just
@@ -233,24 +232,17 @@ export default class MImageBody extends React.Component {
                     info.w > thumbWidth ||
                     info.h > thumbHeight
                 );
-                const isLargeFileSize = info.size > 1*1024*1024;
+                const isLargeFileSize = info.size > 1*1024*1024; // 1mb
 
                 if (isLargeFileSize && isLargerThanThumbnail) {
                     // image is too large physically and bytewise to clutter our timeline so
                     // we ask for a thumbnail, despite knowing that it will be max 800x600
                     // despite us being retina (as synapse doesn't do 1600x1200 thumbs yet).
-                    return this.context.mxcUrlToHttp(
-                        content.url,
-                        thumbWidth,
-                        thumbHeight,
-                    );
+                    return media.getThumbnailOfSourceHttp(thumbWidth, thumbHeight);
                 } else {
                     // download the original image otherwise, so we can scale it client side
                     // to take pixelRatio into account.
-                    // ( no width/height means we want the original image)
-                    return this.context.mxcUrlToHttp(
-                        content.url,
-                    );
+                    return media.srcHttp;
                 }
             }
         }
diff --git a/src/components/views/messages/MVideoBody.tsx b/src/components/views/messages/MVideoBody.tsx
index 89985dee7d..32b071ea24 100644
--- a/src/components/views/messages/MVideoBody.tsx
+++ b/src/components/views/messages/MVideoBody.tsx
@@ -23,6 +23,7 @@ import { _t } from '../../../languageHandler';
 import SettingsStore from "../../../settings/SettingsStore";
 import InlineSpinner from '../elements/InlineSpinner';
 import {replaceableComponent} from "../../../utils/replaceableComponent";
+import {mediaFromContent} from "../../../customisations/Media";
 
 interface IProps {
     /* the MatrixEvent to show */
@@ -76,11 +77,11 @@ export default class MVideoBody extends React.PureComponent<IProps, IState> {
     }
 
     private getContentUrl(): string|null {
-        const content = this.props.mxEvent.getContent();
-        if (content.file !== undefined) {
+        const media = mediaFromContent(this.props.mxEvent.getContent());
+        if (media.isEncrypted) {
             return this.state.decryptedUrl;
         } else {
-            return MatrixClientPeg.get().mxcUrlToHttp(content.url);
+            return media.srcHttp;
         }
     }
 
@@ -91,10 +92,11 @@ export default class MVideoBody extends React.PureComponent<IProps, IState> {
 
     private getThumbUrl(): string|null {
         const content = this.props.mxEvent.getContent();
-        if (content.file !== undefined) {
+        const media = mediaFromContent(content);
+        if (media.isEncrypted) {
             return this.state.decryptedThumbnailUrl;
-        } else if (content.info && content.info.thumbnail_url) {
-            return MatrixClientPeg.get().mxcUrlToHttp(content.info.thumbnail_url);
+        } else if (media.hasThumbnail) {
+            return media.thumbnailHttp;
         } else {
             return null;
         }
diff --git a/src/components/views/messages/RoomAvatarEvent.js b/src/components/views/messages/RoomAvatarEvent.js
index ba860216f0..00aaf9bfda 100644
--- a/src/components/views/messages/RoomAvatarEvent.js
+++ b/src/components/views/messages/RoomAvatarEvent.js
@@ -24,6 +24,7 @@ import * as sdk from '../../../index';
 import Modal from '../../../Modal';
 import AccessibleButton from '../elements/AccessibleButton';
 import {replaceableComponent} from "../../../utils/replaceableComponent";
+import {mediaFromMxc} from "../../../customisations/Media";
 
 @replaceableComponent("views.messages.RoomAvatarEvent")
 export default class RoomAvatarEvent extends React.Component {
@@ -35,7 +36,7 @@ export default class RoomAvatarEvent extends React.Component {
     onAvatarClick = () => {
         const cli = MatrixClientPeg.get();
         const ev = this.props.mxEvent;
-        const httpUrl = cli.mxcUrlToHttp(ev.getContent().url);
+        const httpUrl = mediaFromMxc(ev.getContent().url).srcHttp;
 
         const room = cli.getRoom(this.props.mxEvent.getRoomId());
         const text = _t('%(senderDisplayName)s changed the avatar for %(roomName)s', {
diff --git a/src/components/views/right_panel/UserInfo.tsx b/src/components/views/right_panel/UserInfo.tsx
index eb47a56269..d415d19852 100644
--- a/src/components/views/right_panel/UserInfo.tsx
+++ b/src/components/views/right_panel/UserInfo.tsx
@@ -63,6 +63,7 @@ import { EventType } from "matrix-js-sdk/src/@types/event";
 import { SetRightPanelPhasePayload } from "../../../dispatcher/payloads/SetRightPanelPhasePayload";
 import RoomAvatar from "../avatars/RoomAvatar";
 import RoomName from "../elements/RoomName";
+import {mediaFromMxc} from "../../../customisations/Media";
 
 interface IDevice {
     deviceId: string;
@@ -1408,7 +1409,7 @@ const UserInfoHeader: React.FC<{
         const avatarUrl = member.getMxcAvatarUrl ? member.getMxcAvatarUrl() : member.avatarUrl;
         if (!avatarUrl) return;
 
-        const httpUrl = cli.mxcUrlToHttp(avatarUrl);
+        const httpUrl = mediaFromMxc(avatarUrl).srcHttp;
         const params = {
             src: httpUrl,
             name: member.name,
diff --git a/src/components/views/room_settings/RoomProfileSettings.js b/src/components/views/room_settings/RoomProfileSettings.js
index 563368384b..3dbe2b2b7f 100644
--- a/src/components/views/room_settings/RoomProfileSettings.js
+++ b/src/components/views/room_settings/RoomProfileSettings.js
@@ -21,6 +21,7 @@ import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import Field from "../elements/Field";
 import * as sdk from "../../../index";
 import {replaceableComponent} from "../../../utils/replaceableComponent";
+import {mediaFromMxc} from "../../../customisations/Media";
 
 // TODO: Merge with ProfileSettings?
 @replaceableComponent("views.room_settings.RoomProfileSettings")
@@ -38,7 +39,7 @@ export default class RoomProfileSettings extends React.Component {
 
         const avatarEvent = room.currentState.getStateEvents("m.room.avatar", "");
         let avatarUrl = avatarEvent && avatarEvent.getContent() ? avatarEvent.getContent()["url"] : null;
-        if (avatarUrl) avatarUrl = client.mxcUrlToHttp(avatarUrl, 96, 96, 'crop', false);
+        if (avatarUrl) avatarUrl = mediaFromMxc(avatarUrl).getSquareThumbnailHttp(96);
 
         const topicEvent = room.currentState.getStateEvents("m.room.topic", "");
         const topic = topicEvent && topicEvent.getContent() ? topicEvent.getContent()['topic'] : '';
@@ -112,7 +113,7 @@ export default class RoomProfileSettings extends React.Component {
         if (this.state.avatarFile) {
             const uri = await client.uploadContent(this.state.avatarFile);
             await client.sendStateEvent(this.props.roomId, 'm.room.avatar', {url: uri}, '');
-            newState.avatarUrl = client.mxcUrlToHttp(uri, 96, 96, 'crop', false);
+            newState.avatarUrl = mediaFromMxc(uri).getSquareThumbnailHttp(96);
             newState.originalAvatarUrl = newState.avatarUrl;
             newState.avatarFile = null;
         } else if (this.state.originalAvatarUrl !== this.state.avatarUrl) {
diff --git a/src/components/views/rooms/LinkPreviewWidget.js b/src/components/views/rooms/LinkPreviewWidget.js
index 39c9f0bcf7..536abf57fc 100644
--- a/src/components/views/rooms/LinkPreviewWidget.js
+++ b/src/components/views/rooms/LinkPreviewWidget.js
@@ -26,6 +26,7 @@ import Modal from "../../../Modal";
 import * as ImageUtils from "../../../ImageUtils";
 import { _t } from "../../../languageHandler";
 import {replaceableComponent} from "../../../utils/replaceableComponent";
+import {mediaFromMxc} from "../../../customisations/Media";
 
 @replaceableComponent("views.rooms.LinkPreviewWidget")
 export default class LinkPreviewWidget extends React.Component {
@@ -83,7 +84,7 @@ export default class LinkPreviewWidget extends React.Component {
 
         let src = p["og:image"];
         if (src && src.startsWith("mxc://")) {
-            src = MatrixClientPeg.get().mxcUrlToHttp(src);
+            src = mediaFromMxc(src).srcHttp;
         }
 
         const params = {
@@ -109,9 +110,11 @@ export default class LinkPreviewWidget extends React.Component {
         if (!SettingsStore.getValue("showImages")) {
             image = null; // Don't render a button to show the image, just hide it outright
         }
-        const imageMaxWidth = 100; const imageMaxHeight = 100;
+        const imageMaxWidth = 100;
+        const imageMaxHeight = 100;
         if (image && image.startsWith("mxc://")) {
-            image = MatrixClientPeg.get().mxcUrlToHttp(image, imageMaxWidth, imageMaxHeight);
+            // We deliberately don't want a square here, so use the source HTTP thumbnail function
+            image = mediaFromMxc(image).getThumbnailOfSourceHttp(imageMaxWidth, imageMaxHeight, 'scale');
         }
 
         let thumbHeight = imageMaxHeight;
diff --git a/src/components/views/settings/ChangeAvatar.js b/src/components/views/settings/ChangeAvatar.js
index 8067046ffd..0b6739df64 100644
--- a/src/components/views/settings/ChangeAvatar.js
+++ b/src/components/views/settings/ChangeAvatar.js
@@ -21,6 +21,7 @@ import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import Spinner from '../elements/Spinner';
 import {replaceableComponent} from "../../../utils/replaceableComponent";
+import {mediaFromMxc} from "../../../customisations/Media";
 
 @replaceableComponent("views.settings.ChangeAvatar")
 export default class ChangeAvatar extends React.Component {
@@ -117,7 +118,7 @@ export default class ChangeAvatar extends React.Component {
         httpPromise.then(function() {
             self.setState({
                 phase: ChangeAvatar.Phases.Display,
-                avatarUrl: MatrixClientPeg.get().mxcUrlToHttp(newUrl),
+                avatarUrl: mediaFromMxc(newUrl).srcHttp,
             });
         }, function(error) {
             self.setState({
diff --git a/src/components/views/settings/ProfileSettings.js b/src/components/views/settings/ProfileSettings.js
index 30dcdc3c47..971b868751 100644
--- a/src/components/views/settings/ProfileSettings.js
+++ b/src/components/views/settings/ProfileSettings.js
@@ -24,6 +24,7 @@ import {OwnProfileStore} from "../../../stores/OwnProfileStore";
 import Modal from "../../../Modal";
 import ErrorDialog from "../dialogs/ErrorDialog";
 import {replaceableComponent} from "../../../utils/replaceableComponent";
+import {mediaFromMxc} from "../../../customisations/Media";
 
 @replaceableComponent("views.settings.ProfileSettings")
 export default class ProfileSettings extends React.Component {
@@ -32,7 +33,7 @@ export default class ProfileSettings extends React.Component {
 
         const client = MatrixClientPeg.get();
         let avatarUrl = OwnProfileStore.instance.avatarMxc;
-        if (avatarUrl) avatarUrl = client.mxcUrlToHttp(avatarUrl, 96, 96, 'crop', false);
+        if (avatarUrl) avatarUrl = mediaFromMxc(avatarUrl).getSquareThumbnailHttp(96);
         this.state = {
             userId: client.getUserId(),
             originalDisplayName: OwnProfileStore.instance.displayName,
@@ -97,7 +98,7 @@ export default class ProfileSettings extends React.Component {
                     ` (${this.state.avatarFile.size}) bytes`);
                 const uri = await client.uploadContent(this.state.avatarFile);
                 await client.setAvatarUrl(uri);
-                newState.avatarUrl = client.mxcUrlToHttp(uri, 96, 96, 'crop', false);
+                newState.avatarUrl = mediaFromMxc(uri).getSquareThumbnailHttp(96);
                 newState.originalAvatarUrl = newState.avatarUrl;
                 newState.avatarFile = null;
             } else if (this.state.originalAvatarUrl !== this.state.avatarUrl) {
diff --git a/src/customisations/Media.ts b/src/customisations/Media.ts
index 27abc6bc50..f42307c530 100644
--- a/src/customisations/Media.ts
+++ b/src/customisations/Media.ts
@@ -16,6 +16,7 @@
 
 import {MatrixClientPeg} from "../MatrixClientPeg";
 import {IMediaEventContent, IPreparedMedia, prepEventContentAsMedia} from "./models/IMediaEventContent";
+import {ResizeMode} from "./models/ResizeMode";
 
 // Populate this class with the details of your customisations when copying it.
 
@@ -33,6 +34,13 @@ export class Media {
     constructor(private prepared: IPreparedMedia) {
     }
 
+    /**
+     * True if the media appears to be encrypted. Actual file contents may vary.
+     */
+    public get isEncrypted(): boolean {
+        return !!this.prepared.file;
+    }
+
     /**
      * The MXC URI of the source media.
      */
@@ -62,6 +70,15 @@ export class Media {
         return MatrixClientPeg.get().mxcUrlToHttp(this.srcMxc);
     }
 
+    /**
+     * The HTTP URL for the thumbnail media (without any specified width, height, etc). Null/undefined
+     * if no thumbnail media recorded.
+     */
+    public get thumbnailHttp(): string | undefined | null {
+        if (!this.hasThumbnail) return null;
+        return MatrixClientPeg.get().mxcUrlToHttp(this.thumbnailMxc);
+    }
+
     /**
      * Gets the HTTP URL for the thumbnail media with the requested characteristics, if a thumbnail
      * is recorded for this media. Returns null/undefined otherwise.
@@ -70,7 +87,7 @@ export class Media {
      * @param {"scale"|"crop"} mode The desired thumbnailing mode. Defaults to scale.
      * @returns {string} The HTTP URL which points to the thumbnail.
      */
-    public getThumbnailHttp(width: number, height: number, mode: 'scale' | 'crop' = "scale"): string | null | undefined {
+    public getThumbnailHttp(width: number, height: number, mode: ResizeMode = "scale"): string | null | undefined {
         if (!this.hasThumbnail) return null;
         return MatrixClientPeg.get().mxcUrlToHttp(this.thumbnailMxc, width, height, mode);
     }
@@ -82,10 +99,23 @@ export class Media {
      * @param {"scale"|"crop"} mode The desired thumbnailing mode. Defaults to scale.
      * @returns {string} The HTTP URL which points to the thumbnail.
      */
-    public getThumbnailOfSourceHttp(width: number, height: number, mode: 'scale' | 'crop' = "scale"): string {
+    public getThumbnailOfSourceHttp(width: number, height: number, mode: ResizeMode = "scale"): string {
         return MatrixClientPeg.get().mxcUrlToHttp(this.srcMxc, width, height, mode);
     }
 
+    /**
+     * Creates a square thumbnail of the media. If the media has a thumbnail recorded, that MXC will
+     * be used, otherwise the source media will be used.
+     * @param {number} dim The desired width and height.
+     * @returns {string} An HTTP URL for the thumbnail.
+     */
+    public getSquareThumbnailHttp(dim: number): string {
+        if (this.hasThumbnail) {
+            return this.getThumbnailHttp(dim, dim, 'crop');
+        }
+        return this.getThumbnailOfSourceHttp(dim, dim, 'crop');
+    }
+
     /**
      * Downloads the source media.
      * @returns {Promise<Response>} Resolves to the server's response for chaining.
@@ -102,7 +132,7 @@ export class Media {
      * @param {"scale"|"crop"} mode The desired thumbnailing mode. Defaults to scale.
      * @returns {Promise<Response>} Resolves to the server's response for chaining.
      */
-    public downloadThumbnail(width: number, height: number, mode: 'scale' | 'crop' = "scale"): Promise<Response> {
+    public downloadThumbnail(width: number, height: number, mode: ResizeMode = "scale"): Promise<Response> {
         if (!this.hasThumbnail) throw new Error("Cannot download non-existent thumbnail");
         return fetch(this.getThumbnailHttp(width, height, mode));
     }
@@ -114,7 +144,7 @@ export class Media {
      * @param {"scale"|"crop"} mode The desired thumbnailing mode. Defaults to scale.
      * @returns {Promise<Response>} Resolves to the server's response for chaining.
      */
-    public downloadThumbnailOfSource(width: number, height: number, mode: 'scale' | 'crop' = "scale"): Promise<Response> {
+    public downloadThumbnailOfSource(width: number, height: number, mode: ResizeMode = "scale"): Promise<Response> {
         return fetch(this.getThumbnailOfSourceHttp(width, height, mode));
     }
 }
diff --git a/src/customisations/models/ResizeMode.ts b/src/customisations/models/ResizeMode.ts
new file mode 100644
index 0000000000..401b6723e5
--- /dev/null
+++ b/src/customisations/models/ResizeMode.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2021 The Matrix.org Foundation C.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 type ResizeMode = "scale" | "crop";
diff --git a/src/stores/OwnProfileStore.ts b/src/stores/OwnProfileStore.ts
index 8983380fec..5e722877e2 100644
--- a/src/stores/OwnProfileStore.ts
+++ b/src/stores/OwnProfileStore.ts
@@ -22,6 +22,7 @@ import { User } from "matrix-js-sdk/src/models/user";
 import { throttle } from "lodash";
 import { MatrixClientPeg } from "../MatrixClientPeg";
 import { _t } from "../languageHandler";
+import {mediaFromMxc} from "../customisations/Media";
 
 interface IState {
     displayName?: string;
@@ -72,8 +73,12 @@ export class OwnProfileStore extends AsyncStoreWithClient<IState> {
      */
     public getHttpAvatarUrl(size = 0): string {
         if (!this.avatarMxc) return null;
-        const adjustedSize = size > 1 ? size : undefined; // don't let negatives or zero through
-        return this.matrixClient.mxcUrlToHttp(this.avatarMxc, adjustedSize, adjustedSize);
+        const media = mediaFromMxc(this.avatarMxc);
+        if (!size || size <= 0) {
+            return media.srcHttp;
+        } else {
+            return media.getSquareThumbnailHttp(size);
+        }
     }
 
     protected async onNotReady() {

From fa5d98c319c5cddea8fe94c0cc70215e7909401f Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 5 Mar 2021 18:45:09 -0700
Subject: [PATCH 257/420] Convert cases of getHttpUriForMxc to new media
 customisation

---
 src/Avatar.ts                                    | 10 +++-------
 src/components/structures/RoomDirectory.js       |  9 ++++-----
 src/components/views/avatars/RoomAvatar.tsx      | 16 ++++++++--------
 src/components/views/avatars/WidgetAvatar.tsx    |  4 ++--
 .../dialogs/CommunityPrototypeInviteDialog.tsx   | 10 ++++++----
 src/components/views/dialogs/InviteDialog.tsx    | 14 +++++++-------
 src/components/views/rooms/RoomDetailRow.js      | 10 +++++-----
 src/components/views/settings/BridgeTile.tsx     |  8 ++------
 8 files changed, 37 insertions(+), 44 deletions(-)

diff --git a/src/Avatar.ts b/src/Avatar.ts
index e2557e21a8..eeef3e2c69 100644
--- a/src/Avatar.ts
+++ b/src/Avatar.ts
@@ -14,13 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {getHttpUriForMxc} from "matrix-js-sdk/src/content-repo";
 import {RoomMember} from "matrix-js-sdk/src/models/room-member";
 import {User} from "matrix-js-sdk/src/models/user";
 import {Room} from "matrix-js-sdk/src/models/room";
 
 import {MatrixClientPeg} from './MatrixClientPeg';
 import DMRoomMap from './utils/DMRoomMap';
+import {mediaFromMxc} from "./customisations/Media";
 
 export type ResizeMethod = "crop" | "scale";
 
@@ -47,16 +47,12 @@ export function avatarUrlForMember(member: RoomMember, width: number, height: nu
 }
 
 export function avatarUrlForUser(user: User, width: number, height: number, resizeMethod?: ResizeMethod) {
-    const url = getHttpUriForMxc(
-        MatrixClientPeg.get().getHomeserverUrl(), user.avatarUrl,
+    if (!user.avatarUrl) return null;
+    return mediaFromMxc(user.avatarUrl).getThumbnailOfSourceHttp(
         Math.floor(width * window.devicePixelRatio),
         Math.floor(height * window.devicePixelRatio),
         resizeMethod,
     );
-    if (!url || url.length === 0) {
-        return null;
-    }
-    return url;
 }
 
 function isValidHexColor(color: string): boolean {
diff --git a/src/components/structures/RoomDirectory.js b/src/components/structures/RoomDirectory.js
index 363c67262b..3613261da6 100644
--- a/src/components/structures/RoomDirectory.js
+++ b/src/components/structures/RoomDirectory.js
@@ -27,7 +27,6 @@ import { _t } from '../../languageHandler';
 import SdkConfig from '../../SdkConfig';
 import { instanceForInstanceId, protocolNameForInstanceId } from '../../utils/DirectoryUtils';
 import Analytics from '../../Analytics';
-import {getHttpUriForMxc} from "matrix-js-sdk/src/content-repo";
 import {ALL_ROOMS} from "../views/directory/NetworkDropdown";
 import SettingsStore from "../../settings/SettingsStore";
 import GroupFilterOrderStore from "../../stores/GroupFilterOrderStore";
@@ -35,6 +34,7 @@ import GroupStore from "../../stores/GroupStore";
 import FlairStore from "../../stores/FlairStore";
 import CountlyAnalytics from "../../CountlyAnalytics";
 import {replaceableComponent} from "../../utils/replaceableComponent";
+import {mediaFromMxc} from "../../customisations/Media";
 
 const MAX_NAME_LENGTH = 80;
 const MAX_TOPIC_LENGTH = 800;
@@ -521,10 +521,9 @@ export default class RoomDirectory extends React.Component {
             topic = `${topic.substring(0, MAX_TOPIC_LENGTH)}...`;
         }
         topic = linkifyAndSanitizeHtml(topic);
-        const avatarUrl = getHttpUriForMxc(
-                                MatrixClientPeg.get().getHomeserverUrl(),
-                                room.avatar_url, 32, 32, "crop",
-                            );
+        let avatarUrl = null;
+        if (room.avatar_url) avatarUrl = mediaFromMxc(room.avatar_url).getSquareThumbnailHttp(32);
+
         return [
             <div key={ `${room.room_id}_avatar` }
                 onClick={(ev) => this.onRoomClicked(room, ev)}
diff --git a/src/components/views/avatars/RoomAvatar.tsx b/src/components/views/avatars/RoomAvatar.tsx
index 0a59f6e36a..31245b44b7 100644
--- a/src/components/views/avatars/RoomAvatar.tsx
+++ b/src/components/views/avatars/RoomAvatar.tsx
@@ -15,7 +15,6 @@ limitations under the License.
 */
 import React, {ComponentProps} from 'react';
 import Room from 'matrix-js-sdk/src/models/room';
-import {getHttpUriForMxc} from 'matrix-js-sdk/src/content-repo';
 
 import BaseAvatar from './BaseAvatar';
 import ImageView from '../elements/ImageView';
@@ -24,6 +23,7 @@ import Modal from '../../../Modal';
 import * as Avatar from '../../../Avatar';
 import {ResizeMethod} from "../../../Avatar";
 import {replaceableComponent} from "../../../utils/replaceableComponent";
+import {mediaFromMxc} from "../../../customisations/Media";
 
 interface IProps extends Omit<ComponentProps<typeof BaseAvatar>, "name" | "idName" | "url" | "onClick"> {
     // Room may be left unset here, but if it is,
@@ -90,16 +90,16 @@ export default class RoomAvatar extends React.Component<IProps, IState> {
     };
 
     private static getImageUrls(props: IProps): string[] {
-        return [
-            getHttpUriForMxc(
-                MatrixClientPeg.get().getHomeserverUrl(),
-                // Default props don't play nicely with getDerivedStateFromProps
-                //props.oobData !== undefined ? props.oobData.avatarUrl : {},
-                props.oobData.avatarUrl,
+        let oobAvatar = null;
+        if (props.oobData.avatarUrl) {
+            oobAvatar = mediaFromMxc(props.oobData.avatarUrl).getThumbnailOfSourceHttp(
                 Math.floor(props.width * window.devicePixelRatio),
                 Math.floor(props.height * window.devicePixelRatio),
                 props.resizeMethod,
-            ), // highest priority
+            );
+        }
+        return [
+            oobAvatar, // highest priority
             RoomAvatar.getRoomAvatarUrl(props),
         ].filter(function(url) {
             return (url !== null && url !== "");
diff --git a/src/components/views/avatars/WidgetAvatar.tsx b/src/components/views/avatars/WidgetAvatar.tsx
index 04cfce7670..6468b0dd49 100644
--- a/src/components/views/avatars/WidgetAvatar.tsx
+++ b/src/components/views/avatars/WidgetAvatar.tsx
@@ -16,11 +16,11 @@ limitations under the License.
 
 import React, {ComponentProps, useContext} from 'react';
 import classNames from 'classnames';
-import {getHttpUriForMxc} from "matrix-js-sdk/src/content-repo";
 
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import {IApp} from "../../../stores/WidgetStore";
 import BaseAvatar, {BaseAvatarType} from "./BaseAvatar";
+import {mediaFromMxc} from "../../../customisations/Media";
 
 interface IProps extends Omit<ComponentProps<BaseAvatarType>, "name" | "url" | "urls"> {
     app: IApp;
@@ -47,7 +47,7 @@ const WidgetAvatar: React.FC<IProps> = ({ app, className, width = 20, height = 2
             name={app.id}
             className={classNames("mx_WidgetAvatar", className)}
             // MSC2765
-            url={app.avatar_url ? getHttpUriForMxc(cli.getHomeserverUrl(), app.avatar_url, 20, 20, "crop") : undefined}
+            url={app.avatar_url ? mediaFromMxc(app.avatar_url).getSquareThumbnailHttp(20) : undefined}
             urls={iconUrls}
             width={width}
             height={height}
diff --git a/src/components/views/dialogs/CommunityPrototypeInviteDialog.tsx b/src/components/views/dialogs/CommunityPrototypeInviteDialog.tsx
index d1080566ac..2635f95bb7 100644
--- a/src/components/views/dialogs/CommunityPrototypeInviteDialog.tsx
+++ b/src/components/views/dialogs/CommunityPrototypeInviteDialog.tsx
@@ -26,12 +26,12 @@ import SdkConfig from "../../../SdkConfig";
 import { RoomMember } from "matrix-js-sdk/src/models/room-member";
 import InviteDialog from "./InviteDialog";
 import BaseAvatar from "../avatars/BaseAvatar";
-import {getHttpUriForMxc} from "matrix-js-sdk/src/content-repo";
 import {inviteMultipleToRoom, showAnyInviteErrors} from "../../../RoomInvite";
 import StyledCheckbox from "../elements/StyledCheckbox";
 import Modal from "../../../Modal";
 import ErrorDialog from "./ErrorDialog";
 import {replaceableComponent} from "../../../utils/replaceableComponent";
+import {mediaFromMxc} from "../../../customisations/Media";
 
 interface IProps extends IDialogProps {
     roomId: string;
@@ -142,12 +142,14 @@ export default class CommunityPrototypeInviteDialog extends React.PureComponent<
 
     private renderPerson(person: IPerson, key: any) {
         const avatarSize = 36;
+        let avatarUrl = null;
+        if (person.user.getMxcAvatarUrl()) {
+            avatarUrl = mediaFromMxc(person.user.getMxcAvatarUrl()).getSquareThumbnailHttp(avatarSize);
+        }
         return (
             <div className="mx_CommunityPrototypeInviteDialog_person" key={key}>
                 <BaseAvatar
-                    url={getHttpUriForMxc(
-                        MatrixClientPeg.get().getHomeserverUrl(), person.user.getMxcAvatarUrl(),
-                        avatarSize, avatarSize, "crop")}
+                    url={avatarUrl}
                     name={person.user.name}
                     idName={person.user.userId}
                     width={avatarSize}
diff --git a/src/components/views/dialogs/InviteDialog.tsx b/src/components/views/dialogs/InviteDialog.tsx
index b28cc1bf41..9aef421d5a 100644
--- a/src/components/views/dialogs/InviteDialog.tsx
+++ b/src/components/views/dialogs/InviteDialog.tsx
@@ -22,7 +22,6 @@ import {makeRoomPermalink, makeUserPermalink} from "../../../utils/permalinks/Pe
 import DMRoomMap from "../../../utils/DMRoomMap";
 import {RoomMember} from "matrix-js-sdk/src/models/room-member";
 import SdkConfig from "../../../SdkConfig";
-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";
@@ -43,6 +42,7 @@ import CountlyAnalytics from "../../../CountlyAnalytics";
 import {Room} from "matrix-js-sdk/src/models/room";
 import { MatrixCall } from 'matrix-js-sdk/src/webrtc/call';
 import {replaceableComponent} from "../../../utils/replaceableComponent";
+import {mediaFromMxc} from "../../../customisations/Media";
 
 // we have a number of types defined from the Matrix spec which can't reasonably be altered here.
 /* eslint-disable camelcase */
@@ -160,9 +160,9 @@ class DMUserTile extends React.PureComponent<IDMUserTileProps> {
                 width={avatarSize} height={avatarSize} />
             : <BaseAvatar
                 className='mx_InviteDialog_userTile_avatar'
-                url={getHttpUriForMxc(
-                    MatrixClientPeg.get().getHomeserverUrl(), this.props.member.getMxcAvatarUrl(),
-                    avatarSize, avatarSize, "crop")}
+                url={this.props.member.getMxcAvatarUrl()
+                    ? mediaFromMxc(this.props.member.getMxcAvatarUrl()).getSquareThumbnailHttp(avatarSize)
+                    : null}
                 name={this.props.member.name}
                 idName={this.props.member.userId}
                 width={avatarSize}
@@ -262,9 +262,9 @@ class DMRoomTile extends React.PureComponent<IDMRoomTileProps> {
                 src={require("../../../../res/img/icon-email-pill-avatar.svg")}
                 width={avatarSize} height={avatarSize} />
             : <BaseAvatar
-                url={getHttpUriForMxc(
-                    MatrixClientPeg.get().getHomeserverUrl(), this.props.member.getMxcAvatarUrl(),
-                    avatarSize, avatarSize, "crop")}
+                url={this.props.member.getMxcAvatarUrl()
+                    ? mediaFromMxc(this.props.member.getMxcAvatarUrl()).getSquareThumbnailHttp(avatarSize)
+                    : null}
                 name={this.props.member.name}
                 idName={this.props.member.userId}
                 width={avatarSize}
diff --git a/src/components/views/rooms/RoomDetailRow.js b/src/components/views/rooms/RoomDetailRow.js
index e7c259cd98..62960930f2 100644
--- a/src/components/views/rooms/RoomDetailRow.js
+++ b/src/components/views/rooms/RoomDetailRow.js
@@ -18,10 +18,9 @@ import * as sdk from '../../../index';
 import React, {createRef} from 'react';
 import { _t } from '../../../languageHandler';
 import { linkifyElement } from '../../../HtmlUtils';
-import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import PropTypes from 'prop-types';
-import {getHttpUriForMxc} from "matrix-js-sdk/src/content-repo";
 import {replaceableComponent} from "../../../utils/replaceableComponent";
+import {mediaFromMxc} from "../../../customisations/Media";
 
 export function getDisplayAliasForRoom(room) {
     return room.canonicalAlias || (room.aliases ? room.aliases[0] : "");
@@ -100,13 +99,14 @@ export default class RoomDetailRow extends React.Component {
             { guestJoin }
         </div>) : <div />;
 
+        let avatarUrl = null;
+        if (room.avatarUrl) avatarUrl = mediaFromMxc(room.avatarUrl).getSquareThumbnailHttp(24);
+
         return <tr key={room.roomId} onClick={this.onClick} onMouseDown={this.props.onMouseDown}>
             <td className="mx_RoomDirectory_roomAvatar">
                 <BaseAvatar width={24} height={24} resizeMethod='crop'
                     name={name} idName={name}
-                    url={getHttpUriForMxc(
-                            MatrixClientPeg.get().getHomeserverUrl(),
-                            room.avatarUrl, 24, 24, "crop")} />
+                    url={avatarUrl} />
             </td>
             <td className="mx_RoomDirectory_roomDescription">
                 <div className="mx_RoomDirectory_name">{ name }</div>&nbsp;
diff --git a/src/components/views/settings/BridgeTile.tsx b/src/components/views/settings/BridgeTile.tsx
index b33219ad4a..3565d1ba2e 100644
--- a/src/components/views/settings/BridgeTile.tsx
+++ b/src/components/views/settings/BridgeTile.tsx
@@ -16,9 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import {getHttpUriForMxc} from "matrix-js-sdk/src/content-repo";
 import {_t} from "../../../languageHandler";
-import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import Pill from "../elements/Pill";
 import {makeUserPermalink} from "../../../utils/permalinks/Permalinks";
 import BaseAvatar from "../avatars/BaseAvatar";
@@ -27,6 +25,7 @@ import {MatrixEvent} from "matrix-js-sdk/src/models/event";
 import { Room } from "matrix-js-sdk/src/models/room";
 import { isUrlPermitted } from '../../../HtmlUtils';
 import {replaceableComponent} from "../../../utils/replaceableComponent";
+import {mediaFromMxc} from "../../../customisations/Media";
 
 interface IProps {
     ev: MatrixEvent;
@@ -114,10 +113,7 @@ export default class BridgeTile extends React.PureComponent<IProps> {
         let networkIcon;
 
         if (protocol.avatar_url) {
-            const avatarUrl = getHttpUriForMxc(
-                MatrixClientPeg.get().getHomeserverUrl(),
-                protocol.avatar_url, 64, 64, "crop",
-            );
+            const avatarUrl = mediaFromMxc(protocol.avatar_url).getSquareThumbnailHttp(64);
 
             networkIcon = <BaseAvatar className="protocol-icon"
                 width={48}

From 533c9fed647772d561ccd58bc1e987c91a901b2d Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 5 Mar 2021 18:49:32 -0700
Subject: [PATCH 258/420] Appease the linter

---
 src/HtmlUtils.tsx                               |  1 -
 src/components/structures/LeftPanel.tsx         |  1 -
 src/components/views/avatars/GroupAvatar.tsx    |  1 -
 src/components/views/avatars/WidgetAvatar.tsx   |  5 +----
 src/components/views/elements/AddressTile.js    |  1 -
 src/components/views/elements/Pill.js           | 10 ++++------
 src/components/views/messages/MAudioBody.js     |  1 -
 src/components/views/messages/MFileBody.js      |  1 -
 src/components/views/messages/MVideoBody.tsx    |  1 -
 src/components/views/right_panel/UserInfo.tsx   |  2 +-
 src/customisations/models/IMediaEventContent.ts |  6 +++---
 test/components/structures/GroupView-test.js    |  3 ++-
 12 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/src/HtmlUtils.tsx b/src/HtmlUtils.tsx
index 12752eb20f..59b596a5da 100644
--- a/src/HtmlUtils.tsx
+++ b/src/HtmlUtils.tsx
@@ -32,7 +32,6 @@ import { AllHtmlEntities } from 'html-entities';
 import SettingsStore from './settings/SettingsStore';
 import cheerio from 'cheerio';
 
-import {MatrixClientPeg} from './MatrixClientPeg';
 import {tryTransformPermalinkToLocalHref} from "./utils/permalinks/Permalinks";
 import {SHORTCODE_TO_EMOJI, getEmojiFromUnicode} from "./emoji";
 import ReplyThread from "./components/views/elements/ReplyThread";
diff --git a/src/components/structures/LeftPanel.tsx b/src/components/structures/LeftPanel.tsx
index f7865d094a..9a1ce63785 100644
--- a/src/components/structures/LeftPanel.tsx
+++ b/src/components/structures/LeftPanel.tsx
@@ -36,7 +36,6 @@ import {Key} from "../../Keyboard";
 import IndicatorScrollbar from "../structures/IndicatorScrollbar";
 import AccessibleTooltipButton from "../views/elements/AccessibleTooltipButton";
 import { OwnProfileStore } from "../../stores/OwnProfileStore";
-import { MatrixClientPeg } from "../../MatrixClientPeg";
 import RoomListNumResults from "../views/rooms/RoomListNumResults";
 import LeftPanelWidget from "./LeftPanelWidget";
 import SpacePanel from "../views/spaces/SpacePanel";
diff --git a/src/components/views/avatars/GroupAvatar.tsx b/src/components/views/avatars/GroupAvatar.tsx
index dc363da304..321ca025a3 100644
--- a/src/components/views/avatars/GroupAvatar.tsx
+++ b/src/components/views/avatars/GroupAvatar.tsx
@@ -15,7 +15,6 @@ limitations under the License.
 */
 
 import React from 'react';
-import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import BaseAvatar from './BaseAvatar';
 import {replaceableComponent} from "../../../utils/replaceableComponent";
 import {mediaFromMxc} from "../../../customisations/Media";
diff --git a/src/components/views/avatars/WidgetAvatar.tsx b/src/components/views/avatars/WidgetAvatar.tsx
index 6468b0dd49..cca158269e 100644
--- a/src/components/views/avatars/WidgetAvatar.tsx
+++ b/src/components/views/avatars/WidgetAvatar.tsx
@@ -14,10 +14,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {ComponentProps, useContext} from 'react';
+import React, {ComponentProps} from 'react';
 import classNames from 'classnames';
 
-import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import {IApp} from "../../../stores/WidgetStore";
 import BaseAvatar, {BaseAvatarType} from "./BaseAvatar";
 import {mediaFromMxc} from "../../../customisations/Media";
@@ -27,8 +26,6 @@ interface IProps extends Omit<ComponentProps<BaseAvatarType>, "name" | "url" | "
 }
 
 const WidgetAvatar: React.FC<IProps> = ({ app, className, width = 20, height = 20, ...props }) => {
-    const cli = useContext(MatrixClientContext);
-
     let iconUrls = [require("../../../../res/img/element-icons/room/default_app.svg")];
     // heuristics for some better icons until Widgets support their own icons
     if (app.type.includes("jitsi")) {
diff --git a/src/components/views/elements/AddressTile.js b/src/components/views/elements/AddressTile.js
index 4f5ee45a3c..df66d10a71 100644
--- a/src/components/views/elements/AddressTile.js
+++ b/src/components/views/elements/AddressTile.js
@@ -19,7 +19,6 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import * as sdk from "../../../index";
-import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import { _t } from '../../../languageHandler';
 import { UserAddressType } from '../../../UserAddress.js';
 import {replaceableComponent} from "../../../utils/replaceableComponent";
diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js
index bf99ee6078..e61d312305 100644
--- a/src/components/views/elements/Pill.js
+++ b/src/components/views/elements/Pill.js
@@ -1,7 +1,5 @@
 /*
-Copyright 2017 Vector Creations Ltd
-Copyright 2018 New Vector Ltd
-Copyright 2019, 2021 The Matrix.org Foundation C.I.C.
+Copyright 2017 - 2019, 2021 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -255,12 +253,12 @@ class Pill extends React.Component {
             case Pill.TYPE_GROUP_MENTION: {
                 if (this.state.group) {
                     const {avatarUrl, groupId, name} = this.state.group;
-                    const cli = MatrixClientPeg.get();
 
                     linkText = groupId;
                     if (this.props.shouldShowPillAvatar) {
-                        avatar = <BaseAvatar name={name || groupId} width={16} height={16} aria-hidden="true"
-                                             url={avatarUrl ? mediaFromMxc(avatarUrl).getSquareThumbnailHttp(16) : null} />;
+                        avatar = <BaseAvatar
+                            name={name || groupId} width={16} height={16} aria-hidden="true"
+                            url={avatarUrl ? mediaFromMxc(avatarUrl).getSquareThumbnailHttp(16) : null} />;
                     }
                     pillClass = 'mx_GroupPill';
                 }
diff --git a/src/components/views/messages/MAudioBody.js b/src/components/views/messages/MAudioBody.js
index 78ded9a514..0d5e449fc0 100644
--- a/src/components/views/messages/MAudioBody.js
+++ b/src/components/views/messages/MAudioBody.js
@@ -17,7 +17,6 @@
 import React from 'react';
 import MFileBody from './MFileBody';
 
-import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import { decryptFile } from '../../../utils/DecryptFile';
 import { _t } from '../../../languageHandler';
 import InlineSpinner from '../elements/InlineSpinner';
diff --git a/src/components/views/messages/MFileBody.js b/src/components/views/messages/MFileBody.js
index 07d7beb793..39a03a1304 100644
--- a/src/components/views/messages/MFileBody.js
+++ b/src/components/views/messages/MFileBody.js
@@ -18,7 +18,6 @@ limitations under the License.
 import React, {createRef} from 'react';
 import PropTypes from 'prop-types';
 import filesize from 'filesize';
-import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import {decryptFile} from '../../../utils/DecryptFile';
diff --git a/src/components/views/messages/MVideoBody.tsx b/src/components/views/messages/MVideoBody.tsx
index 32b071ea24..89e661cb2f 100644
--- a/src/components/views/messages/MVideoBody.tsx
+++ b/src/components/views/messages/MVideoBody.tsx
@@ -17,7 +17,6 @@ limitations under the License.
 
 import React from 'react';
 import MFileBody from './MFileBody';
-import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import { decryptFile } from '../../../utils/DecryptFile';
 import { _t } from '../../../languageHandler';
 import SettingsStore from "../../../settings/SettingsStore";
diff --git a/src/components/views/right_panel/UserInfo.tsx b/src/components/views/right_panel/UserInfo.tsx
index d415d19852..aa11b70e50 100644
--- a/src/components/views/right_panel/UserInfo.tsx
+++ b/src/components/views/right_panel/UserInfo.tsx
@@ -1416,7 +1416,7 @@ const UserInfoHeader: React.FC<{
         };
 
         Modal.createDialog(ImageView, params, "mx_Dialog_lightbox");
-    }, [cli, member]);
+    }, [member]);
 
     const avatarElement = (
         <div className="mx_UserInfo_avatar">
diff --git a/src/customisations/models/IMediaEventContent.ts b/src/customisations/models/IMediaEventContent.ts
index 4cbe07dbd5..fb05d76a4d 100644
--- a/src/customisations/models/IMediaEventContent.ts
+++ b/src/customisations/models/IMediaEventContent.ts
@@ -21,7 +21,7 @@ export interface IEncryptedFile {
     mimetype?: string;
     key: {
         alg: string;
-        key_ops: string[];
+        key_ops: string[]; // eslint-disable-line camelcase
         kty: string;
         k: string;
         ext: boolean;
@@ -35,8 +35,8 @@ export interface IMediaEventContent {
     url?: string; // required on unencrypted media
     file?: IEncryptedFile; // required for *encrypted* media
     info?: {
-        thumbnail_url?: string;
-        thumbnail_file?: IEncryptedFile;
+        thumbnail_url?: string; // eslint-disable-line camelcase
+        thumbnail_file?: IEncryptedFile; // eslint-disable-line camelcase
     };
 }
 
diff --git a/test/components/structures/GroupView-test.js b/test/components/structures/GroupView-test.js
index fb942d2f7c..ee5d1b6912 100644
--- a/test/components/structures/GroupView-test.js
+++ b/test/components/structures/GroupView-test.js
@@ -262,7 +262,8 @@ describe('GroupView', function() {
             expect(longDescElement.innerHTML).toContain('<ul>');
             expect(longDescElement.innerHTML).toContain('<li>And lists!</li>');
 
-            const imgSrc = "https://my.home.server/_matrix/media/r0/thumbnail/someimageurl?width=800&amp;height=600";
+            const imgSrc = "https://my.home.server/_matrix/media/r0/thumbnail/someimageurl" +
+                "?width=800&amp;height=600&amp;method=scale";
             expect(longDescElement.innerHTML).toContain('<img src="' + imgSrc + '">');
         });
 

From 2a40bc87cc602ffd569433d1f8c5185a37eaad31 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 8 Mar 2021 17:03:14 -0700
Subject: [PATCH 259/420] Fix ResizeMethod usage

---
 src/components/views/avatars/BaseAvatar.tsx   |  3 ++-
 src/components/views/avatars/GroupAvatar.tsx  |  4 ++--
 src/components/views/avatars/MemberAvatar.tsx |  3 ++-
 src/customisations/Media.ts                   | 10 +++++-----
 src/customisations/models/ResizeMode.ts       | 17 -----------------
 5 files changed, 11 insertions(+), 26 deletions(-)
 delete mode 100644 src/customisations/models/ResizeMode.ts

diff --git a/src/components/views/avatars/BaseAvatar.tsx b/src/components/views/avatars/BaseAvatar.tsx
index 799a559263..e623439174 100644
--- a/src/components/views/avatars/BaseAvatar.tsx
+++ b/src/components/views/avatars/BaseAvatar.tsx
@@ -25,6 +25,7 @@ import AccessibleButton from '../elements/AccessibleButton';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import {useEventEmitter} from "../../../hooks/useEventEmitter";
 import {toPx} from "../../../utils/units";
+import {ResizeMethod} from "../../../Avatar";
 
 interface IProps {
     name: string; // The name (first initial used as default)
@@ -35,7 +36,7 @@ interface IProps {
     width?: number;
     height?: number;
     // XXX: resizeMethod not actually used.
-    resizeMethod?: string;
+    resizeMethod?: ResizeMethod;
     defaultToInitialLetter?: boolean; // true to add default url
     onClick?: React.MouseEventHandler;
     inputRef?: React.RefObject<HTMLImageElement & HTMLSpanElement>;
diff --git a/src/components/views/avatars/GroupAvatar.tsx b/src/components/views/avatars/GroupAvatar.tsx
index 321ca025a3..6d8ef9e8f6 100644
--- a/src/components/views/avatars/GroupAvatar.tsx
+++ b/src/components/views/avatars/GroupAvatar.tsx
@@ -18,7 +18,7 @@ import React from 'react';
 import BaseAvatar from './BaseAvatar';
 import {replaceableComponent} from "../../../utils/replaceableComponent";
 import {mediaFromMxc} from "../../../customisations/Media";
-import {ResizeMode} from "../../../customisations/models/ResizeMode";
+import {ResizeMethod} from "../../../Avatar";
 
 export interface IProps {
         groupId?: string;
@@ -26,7 +26,7 @@ export interface IProps {
         groupAvatarUrl?: string;
         width?: number;
         height?: number;
-        resizeMethod?: ResizeMode;
+        resizeMethod?: ResizeMethod;
         onClick?: React.MouseEventHandler;
 }
 
diff --git a/src/components/views/avatars/MemberAvatar.tsx b/src/components/views/avatars/MemberAvatar.tsx
index 641046aa55..5a866f91fe 100644
--- a/src/components/views/avatars/MemberAvatar.tsx
+++ b/src/components/views/avatars/MemberAvatar.tsx
@@ -23,13 +23,14 @@ import {Action} from "../../../dispatcher/actions";
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import BaseAvatar from "./BaseAvatar";
 import {replaceableComponent} from "../../../utils/replaceableComponent";
+import {ResizeMethod} from "../../../Avatar";
 
 interface IProps extends Omit<React.ComponentProps<typeof BaseAvatar>, "name" | "idName" | "url"> {
     member: RoomMember;
     fallbackUserId?: string;
     width: number;
     height: number;
-    resizeMethod?: string;
+    resizeMethod?: ResizeMethod;
     // The onClick to give the avatar
     onClick?: React.MouseEventHandler;
     // Whether the onClick of the avatar should be overriden to dispatch `Action.ViewUser`
diff --git a/src/customisations/Media.ts b/src/customisations/Media.ts
index f42307c530..812dd974a9 100644
--- a/src/customisations/Media.ts
+++ b/src/customisations/Media.ts
@@ -16,7 +16,7 @@
 
 import {MatrixClientPeg} from "../MatrixClientPeg";
 import {IMediaEventContent, IPreparedMedia, prepEventContentAsMedia} from "./models/IMediaEventContent";
-import {ResizeMode} from "./models/ResizeMode";
+import {ResizeMethod} from "../Avatar";
 
 // Populate this class with the details of your customisations when copying it.
 
@@ -87,7 +87,7 @@ export class Media {
      * @param {"scale"|"crop"} mode The desired thumbnailing mode. Defaults to scale.
      * @returns {string} The HTTP URL which points to the thumbnail.
      */
-    public getThumbnailHttp(width: number, height: number, mode: ResizeMode = "scale"): string | null | undefined {
+    public getThumbnailHttp(width: number, height: number, mode: ResizeMethod = "scale"): string | null | undefined {
         if (!this.hasThumbnail) return null;
         return MatrixClientPeg.get().mxcUrlToHttp(this.thumbnailMxc, width, height, mode);
     }
@@ -99,7 +99,7 @@ export class Media {
      * @param {"scale"|"crop"} mode The desired thumbnailing mode. Defaults to scale.
      * @returns {string} The HTTP URL which points to the thumbnail.
      */
-    public getThumbnailOfSourceHttp(width: number, height: number, mode: ResizeMode = "scale"): string {
+    public getThumbnailOfSourceHttp(width: number, height: number, mode: ResizeMethod = "scale"): string {
         return MatrixClientPeg.get().mxcUrlToHttp(this.srcMxc, width, height, mode);
     }
 
@@ -132,7 +132,7 @@ export class Media {
      * @param {"scale"|"crop"} mode The desired thumbnailing mode. Defaults to scale.
      * @returns {Promise<Response>} Resolves to the server's response for chaining.
      */
-    public downloadThumbnail(width: number, height: number, mode: ResizeMode = "scale"): Promise<Response> {
+    public downloadThumbnail(width: number, height: number, mode: ResizeMethod = "scale"): Promise<Response> {
         if (!this.hasThumbnail) throw new Error("Cannot download non-existent thumbnail");
         return fetch(this.getThumbnailHttp(width, height, mode));
     }
@@ -144,7 +144,7 @@ export class Media {
      * @param {"scale"|"crop"} mode The desired thumbnailing mode. Defaults to scale.
      * @returns {Promise<Response>} Resolves to the server's response for chaining.
      */
-    public downloadThumbnailOfSource(width: number, height: number, mode: ResizeMode = "scale"): Promise<Response> {
+    public downloadThumbnailOfSource(width: number, height: number, mode: ResizeMethod = "scale"): Promise<Response> {
         return fetch(this.getThumbnailOfSourceHttp(width, height, mode));
     }
 }
diff --git a/src/customisations/models/ResizeMode.ts b/src/customisations/models/ResizeMode.ts
deleted file mode 100644
index 401b6723e5..0000000000
--- a/src/customisations/models/ResizeMode.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright 2021 The Matrix.org Foundation C.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 type ResizeMode = "scale" | "crop";

From 4688c887c4a6fa08394e666826481c74b5a17f02 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 8 Mar 2021 17:03:29 -0700
Subject: [PATCH 260/420] Fix GroupAvatar crash

When we don't have an avatar we shouldn't explode.
---
 src/components/views/avatars/GroupAvatar.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/views/avatars/GroupAvatar.tsx b/src/components/views/avatars/GroupAvatar.tsx
index 6d8ef9e8f6..3734ba9504 100644
--- a/src/components/views/avatars/GroupAvatar.tsx
+++ b/src/components/views/avatars/GroupAvatar.tsx
@@ -39,6 +39,7 @@ export default class GroupAvatar extends React.Component<IProps> {
     };
 
     getGroupAvatarUrl() {
+        if (!this.props.groupAvatarUrl) return null;
         return mediaFromMxc(this.props.groupAvatarUrl).getThumbnailOfSourceHttp(
             this.props.width,
             this.props.height,

From 125aef24b99508bfa8248f8bc4c85a4ed05e7e61 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 8 Mar 2021 17:04:00 -0700
Subject: [PATCH 261/420] Convert edge cases of MXC URI conversion to new
 customisation endpoint

---
 src/Avatar.ts                                 | 29 ++++---------------
 src/components/views/avatars/MemberAvatar.tsx | 19 ++++++------
 2 files changed, 16 insertions(+), 32 deletions(-)

diff --git a/src/Avatar.ts b/src/Avatar.ts
index eeef3e2c69..76c88faa1c 100644
--- a/src/Avatar.ts
+++ b/src/Avatar.ts
@@ -18,7 +18,6 @@ import {RoomMember} from "matrix-js-sdk/src/models/room-member";
 import {User} from "matrix-js-sdk/src/models/user";
 import {Room} from "matrix-js-sdk/src/models/room";
 
-import {MatrixClientPeg} from './MatrixClientPeg';
 import DMRoomMap from './utils/DMRoomMap';
 import {mediaFromMxc} from "./customisations/Media";
 
@@ -27,14 +26,11 @@ export type ResizeMethod = "crop" | "scale";
 // Not to be used for BaseAvatar urls as that has similar default avatar fallback already
 export function avatarUrlForMember(member: RoomMember, width: number, height: number, resizeMethod: ResizeMethod) {
     let url: string;
-    if (member && member.getAvatarUrl) {
-        url = member.getAvatarUrl(
-            MatrixClientPeg.get().getHomeserverUrl(),
+    if (member?.getMxcAvatarUrl()) {
+        url = mediaFromMxc(member.getMxcAvatarUrl()).getThumbnailOfSourceHttp(
             Math.floor(width * window.devicePixelRatio),
             Math.floor(height * window.devicePixelRatio),
             resizeMethod,
-            false,
-            false,
         );
     }
     if (!url) {
@@ -150,15 +146,8 @@ export function getInitialLetter(name: string): string {
 export function avatarUrlForRoom(room: Room, width: number, height: number, resizeMethod?: ResizeMethod) {
     if (!room) return null; // null-guard
 
-    const explicitRoomAvatar = room.getAvatarUrl(
-        MatrixClientPeg.get().getHomeserverUrl(),
-        width,
-        height,
-        resizeMethod,
-        false,
-    );
-    if (explicitRoomAvatar) {
-        return explicitRoomAvatar;
+    if (room.getMxcAvatarUrl()) {
+        return mediaFromMxc(room.getMxcAvatarUrl()).getThumbnailOfSourceHttp(width, height, resizeMethod);
     }
 
     // space rooms cannot be DMs so skip the rest
@@ -173,14 +162,8 @@ export function avatarUrlForRoom(room: Room, width: number, height: number, resi
         // then still try to show any avatar (pref. other member)
         otherMember = room.getAvatarFallbackMember();
     }
-    if (otherMember) {
-        return otherMember.getAvatarUrl(
-            MatrixClientPeg.get().getHomeserverUrl(),
-            width,
-            height,
-            resizeMethod,
-            false,
-        );
+    if (otherMember?.getMxcAvatarUrl()) {
+        return mediaFromMxc(otherMember.getMxcAvatarUrl()).getThumbnailOfSourceHttp(width, height, resizeMethod);
     }
     return null;
 }
diff --git a/src/components/views/avatars/MemberAvatar.tsx b/src/components/views/avatars/MemberAvatar.tsx
index 5a866f91fe..3483802af5 100644
--- a/src/components/views/avatars/MemberAvatar.tsx
+++ b/src/components/views/avatars/MemberAvatar.tsx
@@ -20,9 +20,9 @@ import {RoomMember} from "matrix-js-sdk/src/models/room-member";
 
 import dis from "../../../dispatcher/dispatcher";
 import {Action} from "../../../dispatcher/actions";
-import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import BaseAvatar from "./BaseAvatar";
 import {replaceableComponent} from "../../../utils/replaceableComponent";
+import {mediaFromMxc} from "../../../customisations/Media";
 import {ResizeMethod} from "../../../Avatar";
 
 interface IProps extends Omit<React.ComponentProps<typeof BaseAvatar>, "name" | "idName" | "url"> {
@@ -65,17 +65,18 @@ export default class MemberAvatar extends React.Component<IProps, IState> {
 
     private static getState(props: IProps): IState {
         if (props.member && props.member.name) {
-            return {
-                name: props.member.name,
-                title: props.title || props.member.userId,
-                imageUrl: props.member.getAvatarUrl(
-                    MatrixClientPeg.get().getHomeserverUrl(),
+            let imageUrl = null;
+            if (props.member.getMxcAvatarUrl()) {
+                imageUrl = mediaFromMxc(props.member.getMxcAvatarUrl()).getThumbnailOfSourceHttp(
                     Math.floor(props.width * window.devicePixelRatio),
                     Math.floor(props.height * window.devicePixelRatio),
                     props.resizeMethod,
-                    false,
-                    false,
-                ),
+                );
+            }
+            return {
+                name: props.member.name,
+                title: props.title || props.member.userId,
+                imageUrl: imageUrl,
             };
         } else if (props.fallbackUserId) {
             return {

From af9f17219b66c96a56f8e63e87c8ce15e25129cd Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 9 Mar 2021 12:41:36 -0700
Subject: [PATCH 262/420] Fix MemberAvatar crash from EventTilePreview

---
 src/components/views/avatars/MemberAvatar.tsx      | 2 +-
 src/components/views/elements/EventTilePreview.tsx | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/components/views/avatars/MemberAvatar.tsx b/src/components/views/avatars/MemberAvatar.tsx
index 3483802af5..c79cbc0d32 100644
--- a/src/components/views/avatars/MemberAvatar.tsx
+++ b/src/components/views/avatars/MemberAvatar.tsx
@@ -64,7 +64,7 @@ export default class MemberAvatar extends React.Component<IProps, IState> {
     }
 
     private static getState(props: IProps): IState {
-        if (props.member && props.member.name) {
+        if (props.member?.name) {
             let imageUrl = null;
             if (props.member.getMxcAvatarUrl()) {
                 imageUrl = mediaFromMxc(props.member.getMxcAvatarUrl()).getThumbnailOfSourceHttp(
diff --git a/src/components/views/elements/EventTilePreview.tsx b/src/components/views/elements/EventTilePreview.tsx
index c539f2be1c..5fd73f974d 100644
--- a/src/components/views/elements/EventTilePreview.tsx
+++ b/src/components/views/elements/EventTilePreview.tsx
@@ -70,9 +70,7 @@ export default class EventTilePreview extends React.Component<IProps, IState> {
         const client = MatrixClientPeg.get();
         const userId = client.getUserId();
         const profileInfo = await client.getProfileInfo(userId);
-        const avatarUrl = Avatar.avatarUrlForUser(
-            {avatarUrl: profileInfo.avatar_url},
-            AVATAR_SIZE, AVATAR_SIZE, "crop");
+        const avatarUrl = profileInfo.avatar_url;
 
         this.setState({
             userId,
@@ -113,8 +111,9 @@ export default class EventTilePreview extends React.Component<IProps, IState> {
             name: displayname,
             userId: userId,
             getAvatarUrl: (..._) => {
-                return avatarUrl;
+                return Avatar.avatarUrlForUser({avatarUrl}, AVATAR_SIZE, AVATAR_SIZE, "crop");
             },
+            getMxcAvatarUrl: () => avatarUrl,
         };
 
         return event;

From a7debdd94658b09c9a4b0f6854b46fdc9752616e Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 9 Mar 2021 12:54:20 -0700
Subject: [PATCH 263/420] Fix tinting for download icon

As shown in https://github.com/vector-im/element-web/issues/16546
---
 res/css/views/messages/_MFileBody.scss     | 15 +++-
 src/components/views/messages/MFileBody.js | 83 ++++------------------
 src/usercontent/index.js                   | 31 ++++----
 3 files changed, 42 insertions(+), 87 deletions(-)

diff --git a/res/css/views/messages/_MFileBody.scss b/res/css/views/messages/_MFileBody.scss
index e219c0c5e4..b45126acf8 100644
--- a/res/css/views/messages/_MFileBody.scss
+++ b/res/css/views/messages/_MFileBody.scss
@@ -1,5 +1,5 @@
 /*
-Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2015, 2016, 2021 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -16,6 +16,19 @@ limitations under the License.
 
 .mx_MFileBody_download {
     color: $accent-color;
+
+    .mx_MFileBody_download_icon {
+        // 12px instead of 14px to better match surrounding font size
+        width: 12px;
+        height: 12px;
+        mask-size: 12px;
+
+        mask-position: center;
+        mask-repeat: no-repeat;
+        mask-image: url("$(res)/img/download.svg");
+        background-color: $accent-color;
+        display: inline-block;
+    }
 }
 
 .mx_MFileBody_download a {
diff --git a/src/components/views/messages/MFileBody.js b/src/components/views/messages/MFileBody.js
index 39a03a1304..a9bedd1927 100644
--- a/src/components/views/messages/MFileBody.js
+++ b/src/components/views/messages/MFileBody.js
@@ -1,6 +1,5 @@
 /*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2018 New Vector Ltd
+Copyright 2015, 2016, 2018, 2021 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -18,52 +17,24 @@ limitations under the License.
 import React, {createRef} from 'react';
 import PropTypes from 'prop-types';
 import filesize from 'filesize';
-import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import {decryptFile} from '../../../utils/DecryptFile';
-import Tinter from '../../../Tinter';
-import request from 'browser-request';
 import Modal from '../../../Modal';
 import AccessibleButton from "../elements/AccessibleButton";
 import {replaceableComponent} from "../../../utils/replaceableComponent";
 import {mediaFromContent} from "../../../customisations/Media";
+import ErrorDialog from "../dialogs/ErrorDialog";
 
+let downloadIconUrl; // cached copy of the download.svg asset for the sandboxed iframe later on
 
-// A cached tinted copy of require("../../../../res/img/download.svg")
-let tintedDownloadImageURL;
-// Track a list of mounted MFileBody instances so that we can update
-// the require("../../../../res/img/download.svg") when the tint changes.
-let nextMountId = 0;
-const mounts = {};
-
-/**
- * Updates the tinted copy of require("../../../../res/img/download.svg") when the tint changes.
- */
-function updateTintedDownloadImage() {
-    // Download the svg as an XML document.
-    // We could cache the XML response here, but since the tint rarely changes
-    // it's probably not worth it.
-    // Also note that we can't use fetch here because fetch doesn't support
-    // file URLs, which the download image will be if we're running from
-    // the filesystem (like in an Electron wrapper).
-    request({uri: require("../../../../res/img/download.svg")}, (err, response, body) => {
-        if (err) return;
-
-        const svg = new DOMParser().parseFromString(body, "image/svg+xml");
-        // Apply the fixups to the XML.
-        const fixups = Tinter.calcSvgFixups([{contentDocument: svg}]);
-        Tinter.applySvgFixups(fixups);
-        // Encoded the fixed up SVG as a data URL.
-        const svgString = new XMLSerializer().serializeToString(svg);
-        tintedDownloadImageURL = "data:image/svg+xml;base64," + window.btoa(svgString);
-        // Notify each mounted MFileBody that the URL has changed.
-        Object.keys(mounts).forEach(function(id) {
-            mounts[id].tint();
-        });
-    });
+async function cacheDownloadIcon() {
+    if (downloadIconUrl) return; // cached already
+    const svg = await fetch(require("../../../../res/img/download.svg")).then(r => r.text());
+    downloadIconUrl = "data:image/svg+xml;base64," + window.btoa(svg);
 }
 
-Tinter.registerTintable(updateTintedDownloadImage);
+// Cache the asset immediately
+cacheDownloadIcon();
 
 // User supplied content can contain scripts, we have to be careful that
 // we don't accidentally run those script within the same origin as the
@@ -106,6 +77,7 @@ function computedStyle(element) {
     }
     const style = window.getComputedStyle(element, null);
     let cssText = style.cssText;
+    // noinspection EqualityComparisonWithCoercionJS
     if (cssText == "") {
         // Firefox doesn't implement ".cssText" for computed styles.
         // https://bugzilla.mozilla.org/show_bug.cgi?id=137687
@@ -145,7 +117,6 @@ export default class MFileBody extends React.Component {
 
         this._iframe = createRef();
         this._dummyLink = createRef();
-        this._downloadImage = createRef();
     }
 
     /**
@@ -182,48 +153,18 @@ export default class MFileBody extends React.Component {
         return media.srcHttp;
     }
 
-    componentDidMount() {
-        // Add this to the list of mounted components to receive notifications
-        // when the tint changes.
-        this.id = nextMountId++;
-        mounts[this.id] = this;
-        this.tint();
-    }
-
     componentDidUpdate(prevProps, prevState) {
         if (this.props.onHeightChanged && !prevState.decryptedBlob && this.state.decryptedBlob) {
             this.props.onHeightChanged();
         }
     }
 
-    componentWillUnmount() {
-        // Remove this from the list of mounted components
-        delete mounts[this.id];
-    }
-
-    tint = () => {
-        // Update our tinted copy of require("../../../../res/img/download.svg")
-        if (this._downloadImage.current) {
-            this._downloadImage.current.src = tintedDownloadImageURL;
-        }
-        if (this._iframe.current) {
-            // If the attachment is encrypted then the download image
-            // will be inside the iframe so we wont be able to update
-            // it directly.
-            this._iframe.current.contentWindow.postMessage({
-                imgSrc: tintedDownloadImageURL,
-                style: computedStyle(this._dummyLink.current),
-            }, "*");
-        }
-    };
-
     render() {
         const content = this.props.mxEvent.getContent();
         const text = this.presentableTextForFile(content);
         const isEncrypted = content.file !== undefined;
         const fileName = content.body && content.body.length > 0 ? content.body : _t("Attachment");
         const contentUrl = this._getContentUrl();
-        const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
         const fileSize = content.info ? content.info.size : null;
         const fileType = content.info ? content.info.mimetype : "application/octet-stream";
 
@@ -280,7 +221,7 @@ export default class MFileBody extends React.Component {
             // When the iframe loads we tell it to render a download link
             const onIframeLoad = (ev) => {
                 ev.target.contentWindow.postMessage({
-                    imgSrc: tintedDownloadImageURL,
+                    imgSrc: downloadIconUrl,
                     style: computedStyle(this._dummyLink.current),
                     blob: this.state.decryptedBlob,
                     // Set a download attribute for encrypted files so that the file
@@ -384,7 +325,7 @@ export default class MFileBody extends React.Component {
                         {placeholder}
                         <div className="mx_MFileBody_download">
                             <a {...downloadProps}>
-                                <img src={tintedDownloadImageURL} width="12" height="14" ref={this._downloadImage} />
+                                <span className="mx_MFileBody_download_icon" />
                                 { _t("Download %(text)s", { text: text }) }
                             </a>
                         </div>
diff --git a/src/usercontent/index.js b/src/usercontent/index.js
index 6ecd17dcd7..4850dba9b9 100644
--- a/src/usercontent/index.js
+++ b/src/usercontent/index.js
@@ -1,10 +1,8 @@
 function remoteRender(event) {
     const data = event.data;
 
-    const img = document.createElement("img");
+    const img = document.createElement("span"); // we'll mask it as an image
     img.id = "img";
-    img.src = data.imgSrc;
-    img.style = data.imgStyle;
 
     const a = document.createElement("a");
     a.id = "a";
@@ -16,6 +14,21 @@ function remoteRender(event) {
     a.appendChild(img);
     a.appendChild(document.createTextNode(data.textContent));
 
+    // Apply image style after so we can steal the anchor's colour.
+    // Style copied from a rendered version of mx_MFileBody_download_icon
+    img.style = "" +
+        "width: 12px; height: 12px;" +
+        "-webkit-mask-size: 12px;" +
+        "mask-size: 12px;" +
+        "-webkit-mask-position: center;" +
+        "mask-position: center;" +
+        "-webkit-mask-repeat: no-repeat;" +
+        "mask-repeat: no-repeat;" +
+        `-webkit-mask-image: url('${data.imgSrc}');` +
+        `mask-image: url('${data.imgSrc}');` +
+        `background-color: ${a.style.color};` +
+        "display: inline-block;";
+
     const body = document.body;
     // Don't display scrollbars if the link takes more than one line to display.
     body.style = "margin: 0px; overflow: hidden";
@@ -26,20 +39,8 @@ function remoteRender(event) {
     }
 }
 
-function remoteSetTint(event) {
-    const data = event.data;
-
-    const img = document.getElementById("img");
-    img.src = data.imgSrc;
-    img.style = data.imgStyle;
-
-    const a = document.getElementById("a");
-    a.style = data.style;
-}
-
 window.onmessage = function(e) {
     if (e.origin === window.location.origin) {
         if (e.data.blob) remoteRender(e);
-        else remoteSetTint(e);
     }
 };

From ebf1efe01b816eac3f5fa36a58ac671b54ebd5b4 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 9 Mar 2021 14:16:15 -0700
Subject: [PATCH 264/420] docs

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

diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js
index 0a1f875935..3683818027 100644
--- a/src/components/views/messages/MImageBody.js
+++ b/src/components/views/messages/MImageBody.js
@@ -71,7 +71,7 @@ export default class MImageBody extends React.Component {
         this._image = createRef();
     }
 
-    // FIXME: factor this out and aplpy it to MVideoBody and MAudioBody too!
+    // FIXME: factor this out and apply it to MVideoBody and MAudioBody too!
     onClientSync(syncState, prevState) {
         if (this.unmounted) return;
         // Consider the client reconnected if there is no error with syncing.

From 4ebd35f8453108e87d554bfd787af4e5f210e387 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 9 Mar 2021 14:59:17 -0700
Subject: [PATCH 265/420] Remove unused functions

---
 src/customisations/Media.ts | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/src/customisations/Media.ts b/src/customisations/Media.ts
index 812dd974a9..f262179f3d 100644
--- a/src/customisations/Media.ts
+++ b/src/customisations/Media.ts
@@ -123,30 +123,6 @@ export class Media {
     public downloadSource(): Promise<Response> {
         return fetch(this.srcHttp);
     }
-
-    /**
-     * Downloads the thumbnail media with the requested characteristics. If no thumbnail media is present,
-     * this throws an exception.
-     * @param {number} width The desired width of the thumbnail.
-     * @param {number} height The desired height of the thumbnail.
-     * @param {"scale"|"crop"} mode The desired thumbnailing mode. Defaults to scale.
-     * @returns {Promise<Response>} Resolves to the server's response for chaining.
-     */
-    public downloadThumbnail(width: number, height: number, mode: ResizeMethod = "scale"): Promise<Response> {
-        if (!this.hasThumbnail) throw new Error("Cannot download non-existent thumbnail");
-        return fetch(this.getThumbnailHttp(width, height, mode));
-    }
-
-    /**
-     * Downloads a thumbnail of the source media with the requested characteristics.
-     * @param {number} width The desired width of the thumbnail.
-     * @param {number} height The desired height of the thumbnail.
-     * @param {"scale"|"crop"} mode The desired thumbnailing mode. Defaults to scale.
-     * @returns {Promise<Response>} Resolves to the server's response for chaining.
-     */
-    public downloadThumbnailOfSource(width: number, height: number, mode: ResizeMethod = "scale"): Promise<Response> {
-        return fetch(this.getThumbnailOfSourceHttp(width, height, mode));
-    }
 }
 
 /**

From 88a2bdb119d721ccdfbb19a9590f09545f858069 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 10 Mar 2021 16:47:27 -0700
Subject: [PATCH 266/420] Change read receipt drift to be non-fractional

I suspect this is what is causing issues in Firefox for read receipts not falling down.
---
 src/components/views/rooms/ReadReceiptMarker.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/rooms/ReadReceiptMarker.js b/src/components/views/rooms/ReadReceiptMarker.js
index ba2b3064fd..0000d767df 100644
--- a/src/components/views/rooms/ReadReceiptMarker.js
+++ b/src/components/views/rooms/ReadReceiptMarker.js
@@ -156,14 +156,14 @@ export default class ReadReceiptMarker extends React.PureComponent {
         // then shift to the rightmost column,
         // and then it will drop down to its resting position
         //
-        // XXX: We use a fractional left value to trick velocity-animate into actually animating.
+        // XXX: We use a small left value to trick velocity-animate into actually animating.
         // This is a very annoying bug where if it thinks there's no change to `left` then it'll
         // skip applying it, thus making our read receipt at +14px instead of +0px like it
         // should be. This does cause a tiny amount of drift for read receipts, however with a
         // value so small it's not perceived by a user.
         // Note: Any smaller values (or trying to interchange units) might cause read receipts to
         // fail to fall down or cause gaps.
-        startStyles.push({ top: startTopOffset+'px', left: '0.001px' });
+        startStyles.push({ top: startTopOffset+'px', left: '1px' });
         enterTransitionOpts.push({
             duration: bounce ? Math.min(Math.log(Math.abs(startTopOffset)) * 200, 3000) : 300,
             easing: bounce ? 'easeOutBounce' : 'easeOutCubic',

From baab0a0952327efa256de0b43bfba7447694b99c Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 10 Mar 2021 16:47:27 -0700
Subject: [PATCH 267/420] Change read receipt drift to be non-fractional

I suspect this is what is causing issues in Firefox for read receipts not falling down.
---
 src/components/views/rooms/ReadReceiptMarker.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/rooms/ReadReceiptMarker.js b/src/components/views/rooms/ReadReceiptMarker.js
index ba2b3064fd..0000d767df 100644
--- a/src/components/views/rooms/ReadReceiptMarker.js
+++ b/src/components/views/rooms/ReadReceiptMarker.js
@@ -156,14 +156,14 @@ export default class ReadReceiptMarker extends React.PureComponent {
         // then shift to the rightmost column,
         // and then it will drop down to its resting position
         //
-        // XXX: We use a fractional left value to trick velocity-animate into actually animating.
+        // XXX: We use a small left value to trick velocity-animate into actually animating.
         // This is a very annoying bug where if it thinks there's no change to `left` then it'll
         // skip applying it, thus making our read receipt at +14px instead of +0px like it
         // should be. This does cause a tiny amount of drift for read receipts, however with a
         // value so small it's not perceived by a user.
         // Note: Any smaller values (or trying to interchange units) might cause read receipts to
         // fail to fall down or cause gaps.
-        startStyles.push({ top: startTopOffset+'px', left: '0.001px' });
+        startStyles.push({ top: startTopOffset+'px', left: '1px' });
         enterTransitionOpts.push({
             duration: bounce ? Math.min(Math.log(Math.abs(startTopOffset)) * 200, 3000) : 300,
             easing: bounce ? 'easeOutBounce' : 'easeOutCubic',

From 7f52e787482fd20959cfa54b7ce4165ceced7dda Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 10 Mar 2021 21:08:01 -0700
Subject: [PATCH 268/420] Make styles dynamic

---
 src/components/views/messages/MFileBody.js | 1 +
 src/usercontent/index.js                   | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/components/views/messages/MFileBody.js b/src/components/views/messages/MFileBody.js
index a9bedd1927..8f464e08bd 100644
--- a/src/components/views/messages/MFileBody.js
+++ b/src/components/views/messages/MFileBody.js
@@ -222,6 +222,7 @@ export default class MFileBody extends React.Component {
             const onIframeLoad = (ev) => {
                 ev.target.contentWindow.postMessage({
                     imgSrc: downloadIconUrl,
+                    imgStyle: null, // it handles this internally for us. Useful if a downstream changes the icon.
                     style: computedStyle(this._dummyLink.current),
                     blob: this.state.decryptedBlob,
                     // Set a download attribute for encrypted files so that the file
diff --git a/src/usercontent/index.js b/src/usercontent/index.js
index 4850dba9b9..13f38cc31a 100644
--- a/src/usercontent/index.js
+++ b/src/usercontent/index.js
@@ -16,7 +16,7 @@ function remoteRender(event) {
 
     // Apply image style after so we can steal the anchor's colour.
     // Style copied from a rendered version of mx_MFileBody_download_icon
-    img.style = "" +
+    img.style = (data.imgStyle || "" +
         "width: 12px; height: 12px;" +
         "-webkit-mask-size: 12px;" +
         "mask-size: 12px;" +
@@ -24,10 +24,12 @@ function remoteRender(event) {
         "mask-position: center;" +
         "-webkit-mask-repeat: no-repeat;" +
         "mask-repeat: no-repeat;" +
+        "display: inline-block;") + "" +
+
+        // Always add these styles
         `-webkit-mask-image: url('${data.imgSrc}');` +
         `mask-image: url('${data.imgSrc}');` +
-        `background-color: ${a.style.color};` +
-        "display: inline-block;";
+        `background-color: ${a.style.color};`;
 
     const body = document.body;
     // Don't display scrollbars if the link takes more than one line to display.

From 4ca838d4c76e8e44fd197face06be179c59388ce Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 11 Mar 2021 11:04:39 +0000
Subject: [PATCH 269/420] Properly gate SpaceRoomView behind labs

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

diff --git a/src/components/structures/RoomView.tsx b/src/components/structures/RoomView.tsx
index 1961779d0e..f3dff6b217 100644
--- a/src/components/structures/RoomView.tsx
+++ b/src/components/structures/RoomView.tsx
@@ -1874,7 +1874,7 @@ export default class RoomView extends React.Component<IProps, IState> {
             );
         }
 
-        if (this.state.room?.isSpaceRoom()) {
+        if (SettingsStore.getValue("feature_spaces") && this.state.room?.isSpaceRoom()) {
             return <SpaceRoomView
                 space={this.state.room}
                 justCreatedOpts={this.props.justCreatedOpts}

From 6d81634eec5e22c94d44760d73eaed4a4448c3cb Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 11 Mar 2021 11:49:43 +0000
Subject: [PATCH 270/420] Rebuild space previews with new designs

---
 res/css/structures/_SpaceRoomView.scss      | 121 ++++++++++++++++--
 res/css/views/elements/_FormButton.scss     |   6 +
 src/components/structures/SpaceRoomView.tsx | 132 ++++++++++++++------
 src/i18n/strings/en_EN.json                 |  10 +-
 4 files changed, 214 insertions(+), 55 deletions(-)

diff --git a/res/css/structures/_SpaceRoomView.scss b/res/css/structures/_SpaceRoomView.scss
index 38310d39a9..60abe36c29 100644
--- a/res/css/structures/_SpaceRoomView.scss
+++ b/res/css/structures/_SpaceRoomView.scss
@@ -20,6 +20,8 @@ $SpaceRoomViewInnerWidth: 428px;
     .mx_MainSplit > div:first-child {
         padding: 80px 60px;
         flex-grow: 1;
+        max-height: 100%;
+        overflow-y: auto;
 
         h1 {
             margin: 0;
@@ -69,9 +71,116 @@ $SpaceRoomViewInnerWidth: 428px;
         }
     }
 
-    .mx_SpaceRoomView_landing {
-        overflow-y: auto;
+    .mx_SpaceRoomView_preview {
+        padding: 32px 24px !important; // override default padding from above
+        margin: auto;
+        max-width: 480px;
+        box-sizing: border-box;
+        box-shadow: 2px 15px 30px $dialog-shadow-color;
+        border: 1px solid $input-border-color;
+        border-radius: 8px;
 
+        .mx_SpaceRoomView_preview_inviter {
+            display: flex;
+            align-items: center;
+            margin-bottom: 20px;
+            font-size: $font-15px;
+
+            > div {
+                margin-left: 8px;
+
+                .mx_SpaceRoomView_preview_inviter_name {
+                    line-height: $font-18px;
+                }
+
+                .mx_SpaceRoomView_preview_inviter_mxid {
+                    line-height: $font-24px;
+                    color: $secondary-fg-color;
+                }
+            }
+        }
+
+        > .mx_BaseAvatar_image,
+        > .mx_BaseAvatar > .mx_BaseAvatar_image {
+            border-radius: 12px;
+        }
+
+        h1.mx_SpaceRoomView_preview_name {
+            margin: 20px 0 !important; // override default margin from above
+        }
+
+        .mx_SpaceRoomView_preview_info {
+            color: $tertiary-fg-color;
+            font-size: $font-15px;
+            line-height: $font-24px;
+            margin: 20px 0;
+
+            .mx_SpaceRoomView_preview_info_public,
+            .mx_SpaceRoomView_preview_info_private {
+                padding-left: 20px;
+                position: relative;
+
+                &::before {
+                    position: absolute;
+                    content: "";
+                    width: 20px;
+                    height: 20px;
+                    top: 0;
+                    left: -2px;
+                    mask-position: center;
+                    mask-repeat: no-repeat;
+                    background-color: $tertiary-fg-color;
+                }
+            }
+
+            .mx_SpaceRoomView_preview_info_public::before {
+                mask-size: 12px;
+                mask-image: url("$(res)/img/globe.svg");
+            }
+
+            .mx_SpaceRoomView_preview_info_private::before {
+                mask-size: 14px;
+                mask-image: url("$(res)/img/element-icons/lock.svg");
+            }
+
+            .mx_AccessibleButton_kind_link {
+                color: inherit;
+                position: relative;
+                padding-left: 16px;
+
+                &::before {
+                    content: "·"; // visual separator
+                    position: absolute;
+                    left: 6px;
+                }
+            }
+        }
+
+        .mx_SpaceRoomView_preview_topic {
+            font-size: $font-14px;
+            line-height: $font-22px;
+            color: $secondary-fg-color;
+            margin: 20px 0;
+            max-height: 160px;
+            overflow-y: auto;
+        }
+
+        .mx_SpaceRoomView_preview_joinButtons {
+            margin-top: 20px;
+
+            .mx_AccessibleButton {
+                width: 200px;
+                box-sizing: border-box;
+                padding: 14px 0;
+
+                & + .mx_AccessibleButton {
+                    margin-left: 20px;
+                }
+            }
+        }
+    }
+
+    .mx_SpaceRoomView_landing {
         > .mx_BaseAvatar_image,
         > .mx_BaseAvatar > .mx_BaseAvatar_image {
             border-radius: 12px;
@@ -128,14 +237,6 @@ $SpaceRoomViewInnerWidth: 428px;
             font-size: $font-15px;
         }
 
-        .mx_SpaceRoomView_landing_joinButtons {
-            margin-top: 24px;
-
-            .mx_FormButton {
-                padding: 8px 22px;
-            }
-        }
-
         .mx_SpaceRoomView_landing_adminButtons {
             margin-top: 32px;
 
diff --git a/res/css/views/elements/_FormButton.scss b/res/css/views/elements/_FormButton.scss
index 7ec01f17e6..eda201ff03 100644
--- a/res/css/views/elements/_FormButton.scss
+++ b/res/css/views/elements/_FormButton.scss
@@ -33,4 +33,10 @@ limitations under the License.
         color: $notice-primary-color;
         background-color: $notice-primary-bg-color;
     }
+
+    &.mx_AccessibleButton_kind_secondary {
+        color: $secondary-fg-color;
+        border: 1px solid $secondary-fg-color;
+        background-color: unset;
+    }
 }
diff --git a/src/components/structures/SpaceRoomView.tsx b/src/components/structures/SpaceRoomView.tsx
index 9bacdd975d..0b0f2a2ac9 100644
--- a/src/components/structures/SpaceRoomView.tsx
+++ b/src/components/structures/SpaceRoomView.tsx
@@ -94,26 +94,95 @@ const useMyRoomMembership = (room: Room) => {
     return membership;
 };
 
-const SpaceLanding = ({ space, onJoinButtonClicked, onRejectButtonClicked }) => {
+const SpacePreview = ({ space, onJoinButtonClicked, onRejectButtonClicked }) => {
     const cli = useContext(MatrixClientContext);
     const myMembership = useMyRoomMembership(space);
-    const joinRule = space.getJoinRule();
-    const userId = cli.getUserId();
 
+    let inviterSection;
     let joinButtons;
     if (myMembership === "invite") {
-        joinButtons = <div className="mx_SpaceRoomView_landing_joinButtons">
-            <FormButton label={_t("Accept Invite")} onClick={onJoinButtonClicked} />
-            <AccessibleButton kind="link" onClick={onRejectButtonClicked}>
-                {_t("Decline")}
-            </AccessibleButton>
-        </div>;
-    } else if (myMembership !== "join" && joinRule === "public") {
-        joinButtons = <div className="mx_SpaceRoomView_landing_joinButtons">
-            <FormButton label={_t("Join")} onClick={onJoinButtonClicked} />
-        </div>;
+        const inviteSender = space.getMember(cli.getUserId())?.events.member?.getSender();
+        const inviter = inviteSender && space.getMember(inviteSender);
+
+        if (inviteSender) {
+            inviterSection = <div className="mx_SpaceRoomView_preview_inviter">
+                <MemberAvatar member={inviter} width={32} height={32} />
+                <div>
+                    <div className="mx_SpaceRoomView_preview_inviter_name">
+                        { _t("<inviter/> invites you", {}, {
+                            inviter: () => <b>{ inviter.name || inviteSender }</b>,
+                        }) }
+                    </div>
+                    { inviter ? <div className="mx_SpaceRoomView_preview_inviter_mxid">
+                        { inviteSender }
+                    </div> : null }
+                </div>
+            </div>;
+        }
+
+        joinButtons = <>
+            <FormButton label={_t("Reject")} kind="secondary" onClick={onRejectButtonClicked} />
+            <FormButton label={_t("Accept")} onClick={onJoinButtonClicked} />
+        </>;
+    } else {
+        joinButtons = <FormButton label={_t("Join")} onClick={onJoinButtonClicked} />
     }
 
+    let visibilitySection;
+    if (space.getJoinRule() === "public") {
+        visibilitySection = <span className="mx_SpaceRoomView_preview_info_public">
+            { _t("Public space") }
+        </span>;
+    } else {
+        visibilitySection = <span className="mx_SpaceRoomView_preview_info_private">
+            { _t("Private space") }
+        </span>;
+    }
+
+    return <div className="mx_SpaceRoomView_preview">
+        { inviterSection }
+        <RoomAvatar room={space} height={80} width={80} viewAvatarOnClick={true} />
+        <h1 className="mx_SpaceRoomView_preview_name">
+            <RoomName room={space} />
+        </h1>
+        <div className="mx_SpaceRoomView_preview_info">
+            { visibilitySection }
+            <RoomMemberCount room={space}>
+                {(count) => count > 0 ? (
+                    <AccessibleButton
+                        className="mx_SpaceRoomView_preview_memberCount"
+                        kind="link"
+                        onClick={() => {
+                            defaultDispatcher.dispatch<SetRightPanelPhasePayload>({
+                                action: Action.SetRightPanelPhase,
+                                phase: RightPanelPhases.RoomMemberList,
+                                refireParams: { space },
+                            });
+                        }}
+                    >
+                        { _t("%(count)s members", { count }) }
+                    </AccessibleButton>
+                ) : null}
+            </RoomMemberCount>
+        </div>
+        <RoomTopic room={space}>
+            {(topic, ref) =>
+                <div className="mx_SpaceRoomView_preview_topic" ref={ref}>
+                    { topic }
+                </div>
+            }
+        </RoomTopic>
+        <div className="mx_SpaceRoomView_preview_joinButtons">
+            { joinButtons }
+        </div>
+    </div>;
+};
+
+const SpaceLanding = ({ space }) => {
+    const cli = useContext(MatrixClientContext);
+    const myMembership = useMyRoomMembership(space);
+    const userId = cli.getUserId();
+
     let inviteButton;
     if (myMembership === "join" && space.canInvite(userId)) {
         inviteButton = (
@@ -227,26 +296,7 @@ const SpaceLanding = ({ space, onJoinButtonClicked, onRejectButtonClicked }) =>
                             ) : null}
                         </RoomMemberCount>
                     </div> };
-                    if (myMembership === "invite") {
-                        const inviteSender = space.getMember(userId)?.events.member?.getSender();
-                        const inviter = inviteSender && space.getMember(inviteSender);
-
-                        if (inviteSender) {
-                            return _t("<inviter/> invited you to <name/>", {}, {
-                                name: tags.name,
-                                inviter: () => inviter
-                                    ? <span className="mx_SpaceRoomView_landing_inviter">
-                                        <MemberAvatar member={inviter} width={26} height={26} viewUserOnClick={true} />
-                                        { inviter.name }
-                                    </span>
-                                    : <span className="mx_SpaceRoomView_landing_inviter">
-                                        { inviteSender }
-                                    </span>,
-                            }) as JSX.Element;
-                        } else {
-                            return _t("You have been invited to <name/>", {}, tags) as JSX.Element;
-                        }
-                    } else if (shouldShowSpaceSettings(cli, space)) {
+                    if (shouldShowSpaceSettings(cli, space)) {
                         if (space.getJoinRule() === "public") {
                             return _t("Your public space <name/>", {}, tags) as JSX.Element;
                         } else {
@@ -260,7 +310,6 @@ const SpaceLanding = ({ space, onJoinButtonClicked, onRejectButtonClicked }) =>
         <div className="mx_SpaceRoomView_landing_topic">
             <RoomTopic room={space} />
         </div>
-        { joinButtons }
         <div className="mx_SpaceRoomView_landing_adminButtons">
             { inviteButton }
             { addRoomButtons }
@@ -548,12 +597,15 @@ export default class SpaceRoomView extends React.PureComponent<IProps, IState> {
     private renderBody() {
         switch (this.state.phase) {
             case Phase.Landing:
-                return <SpaceLanding
-                    space={this.props.space}
-                    onJoinButtonClicked={this.props.onJoinButtonClicked}
-                    onRejectButtonClicked={this.props.onRejectButtonClicked}
-                />;
-
+                if (this.props.space.getMyMembership() === "join") {
+                    return <SpaceLanding space={this.props.space} />;
+                } else {
+                    return <SpacePreview
+                        space={this.props.space}
+                        onJoinButtonClicked={this.props.onJoinButtonClicked}
+                        onRejectButtonClicked={this.props.onRejectButtonClicked}
+                    />;
+                }
             case Phase.PublicCreateRooms:
                 return <SpaceSetupFirstRooms
                     space={this.props.space}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 71aae7fecd..23172d2c13 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2601,14 +2601,14 @@
     "Promoted to users": "Promoted to users",
     "Manage rooms": "Manage rooms",
     "Find a room...": "Find a room...",
-    "Accept Invite": "Accept Invite",
+    "<inviter/> invites you": "<inviter/> invites you",
+    "Public space": "Public space",
+    "Private space": "Private space",
+    "%(count)s members|other": "%(count)s members",
+    "%(count)s members|one": "%(count)s member",
     "Add existing rooms & spaces": "Add existing rooms & spaces",
     "Default Rooms": "Default Rooms",
     "Your server does not support showing space hierarchies.": "Your server does not support showing space hierarchies.",
-    "%(count)s members|other": "%(count)s members",
-    "%(count)s members|one": "%(count)s member",
-    "<inviter/> invited you to <name/>": "<inviter/> invited you to <name/>",
-    "You have been invited to <name/>": "You have been invited to <name/>",
     "Your public space <name/>": "Your public space <name/>",
     "Your private space <name/>": "Your private space <name/>",
     "Welcome to <name/>": "Welcome to <name/>",

From c2e05c647e499e60fbda85f5942db7bb7b689403 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 11 Mar 2021 11:56:53 +0000
Subject: [PATCH 271/420] Remove unused common CSS classes

---
 res/css/_common.scss | 48 --------------------------------------------
 1 file changed, 48 deletions(-)

diff --git a/res/css/_common.scss b/res/css/_common.scss
index 8ae1cc6641..36a81e6651 100644
--- a/res/css/_common.scss
+++ b/res/css/_common.scss
@@ -489,54 +489,6 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
     margin-top: 69px;
 }
 
-.mx_Beta {
-    color: red;
-    margin-right: 10px;
-    position: relative;
-    top: -3px;
-    background-color: white;
-    padding: 0 4px;
-    border-radius: 3px;
-    border: 1px solid darkred;
-    cursor: help;
-    transition-duration: 200ms;
-    font-size: smaller;
-    filter: opacity(0.5);
-}
-
-.mx_Beta:hover {
-    color: white;
-    border: 1px solid gray;
-    background-color: darkred;
-}
-
-.mx_TintableSvgButton {
-    position: relative;
-    display: flex;
-    flex-direction: row;
-    justify-content: center;
-    align-content: center;
-}
-
-.mx_TintableSvgButton object {
-    margin: 0;
-    padding: 0;
-    width: 100%;
-    height: 100%;
-    max-width: 100%;
-    max-height: 100%;
-}
-
-.mx_TintableSvgButton span {
-    position: absolute;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    left: 0;
-    opacity: 0;
-    cursor: pointer;
-}
-
 // username colors
 // used by SenderProfile & RoomPreviewBar
 .mx_Username_color1 {

From b2d4639ec9a5a768415d37f9aff0a255cc55c0ae Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Thu, 11 Mar 2021 13:40:11 +0000
Subject: [PATCH 272/420] Use fsync in reskindex to ensure file is written to
 disk

This should (hopefully) resolve occasional errors where the rename step would
fail because the temporary file did not exist. In addition, this also exits with
an error code if something goes wrong so we notice it early, rather than having
to scroll through pages of logs at release time.
---
 scripts/reskindex.js | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/scripts/reskindex.js b/scripts/reskindex.js
index 12310b77c1..5eaec4d1d5 100755
--- a/scripts/reskindex.js
+++ b/scripts/reskindex.js
@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 const fs = require('fs');
+const { promises: fsp } = fs;
 const path = require('path');
 const glob = require('glob');
 const util = require('util');
@@ -25,6 +26,8 @@ async function reskindex() {
     const header = args.h || args.header;
 
     const strm = fs.createWriteStream(componentIndexTmp);
+    // Wait for the open event to ensure the file descriptor is set
+    await new Promise(resolve => strm.once("open", resolve));
 
     if (header) {
        strm.write(fs.readFileSync(header));
@@ -53,14 +56,9 @@ async function reskindex() {
 
     strm.write("export {components};\n");
     // Ensure the file has been fully written to disk before proceeding
+    await util.promisify(fs.fsync)(strm.fd);
     await util.promisify(strm.end);
-    fs.rename(componentIndexTmp, componentIndex, function(err) {
-        if (err) {
-            console.error("Error moving new index into place: " + err);
-        } else {
-            console.log('Reskindex: completed');
-        }
-    });
+    await fsp.rename(componentIndexTmp, componentIndex);
 }
 
 // Expects both arrays of file names to be sorted
@@ -77,9 +75,17 @@ function filesHaveChanged(files, prevFiles) {
     return false;
 }
 
+// Wrapper since await at the top level is not well supported yet
+function run() {
+    (async function() {
+        await reskindex();
+        console.log("Reskindex completed");
+    })();
+}
+
 // -w indicates watch mode where any FS events will trigger reskindex
 if (!args.w) {
-    reskindex();
+    run();
     return;
 }
 
@@ -87,5 +93,5 @@ let watchDebouncer = null;
 chokidar.watch(path.join(componentsDir, componentJsGlob)).on('all', (event, path) => {
     if (path === componentIndex) return;
     if (watchDebouncer) clearTimeout(watchDebouncer);
-    watchDebouncer = setTimeout(reskindex, 1000);
+    watchDebouncer = setTimeout(run, 1000);
 });

From 90817f3bc6302777dca14d9003916743637788a6 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 11 Mar 2021 09:19:34 -0700
Subject: [PATCH 273/420] Developer documentation

The lint rules don't currently exist, but would apply to `mxcUrlToHttp` and `getHttpUriForMxc`
---
 docs/media-handling.md | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 docs/media-handling.md

diff --git a/docs/media-handling.md b/docs/media-handling.md
new file mode 100644
index 0000000000..a4307fb7d4
--- /dev/null
+++ b/docs/media-handling.md
@@ -0,0 +1,19 @@
+# Media handling
+
+Surely media should be as easy as just putting a URL into an `img` and calling it good, right?
+Not quite. Matrix uses something called a Matrix Content URI (better known as MXC URI) to identify
+content, which is then converted to a regular HTTPS URL on the homeserver. However, sometimes that
+URL can change depending on deployment considerations.
+
+The react-sdk features a [customisation endpoint](https://github.com/vector-im/element-web/blob/develop/docs/customisations.md)
+for media handling where all conversions from MXC URI to HTTPS URL happen. This is to ensure that
+those obscure deployments can route all their media to the right place.
+
+For development, there are currently two functions available: `mediaFromMxc` and `mediaFromContent`.
+The `mediaFromMxc` function should be self-explanatory. `mediaFromContent` takes an event content as
+a parameter and will automatically parse out the source media and thumbnail. Both functions return
+a `Media` object with a number of options on it, such as getting various common HTTPS URLs for the
+media.
+
+**It is extremely important that all media calls are put through this customisation endpoint.** So
+much so it's a lint rule to avoid accidental use of the wrong functions.

From 6ab235f10c5bc502182e7a810e0fdbe6e650deee Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 11 Mar 2021 09:42:55 -0700
Subject: [PATCH 274/420] Fix tests for new call path

We have to mock `fetch` for the caching of the download icon, and then mock out all the function calls used by components to feed a Media object.
---
 package.json                                  |  1 +
 .../structures/MessagePanel-test.js           |  4 +++
 .../elements/MemberEventListSummary-test.js   |  1 +
 .../views/messages/TextualBody-test.js        |  5 ++++
 test/setupTests.js                            |  2 ++
 test/test-utils.js                            |  2 ++
 yarn.lock                                     | 25 +++++++++++++++++++
 7 files changed, 40 insertions(+)

diff --git a/package.json b/package.json
index 7ed1b272da..23af090fd1 100644
--- a/package.json
+++ b/package.json
@@ -157,6 +157,7 @@
     "jest": "^26.6.3",
     "jest-canvas-mock": "^2.3.0",
     "jest-environment-jsdom-sixteen": "^1.0.3",
+    "jest-fetch-mock": "^3.0.3",
     "matrix-mock-request": "^1.2.3",
     "matrix-react-test-utils": "^0.2.2",
     "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz",
diff --git a/test/components/structures/MessagePanel-test.js b/test/components/structures/MessagePanel-test.js
index 2fd5bd6ad1..7347ff2658 100644
--- a/test/components/structures/MessagePanel-test.js
+++ b/test/components/structures/MessagePanel-test.js
@@ -116,6 +116,7 @@ describe('MessagePanel', function() {
                     getAvatarUrl: () => {
                         return "avatar.jpeg";
                     },
+                    getMxcAvatarUrl: () => 'mxc://avatar.url/image.png',
                 },
                 ts: ts0 + i*1000,
                 mship: 'join',
@@ -148,6 +149,7 @@ describe('MessagePanel', function() {
                     getAvatarUrl: () => {
                         return "avatar.jpeg";
                     },
+                    getMxcAvatarUrl: () => 'mxc://avatar.url/image.png',
                 },
                 ts: ts0 + i*1000,
                 mship: 'join',
@@ -193,6 +195,7 @@ describe('MessagePanel', function() {
                     getAvatarUrl: () => {
                         return "avatar.jpeg";
                     },
+                    getMxcAvatarUrl: () => 'mxc://avatar.url/image.png',
                 },
                 ts: ts0 + 1,
                 mship: 'join',
@@ -239,6 +242,7 @@ describe('MessagePanel', function() {
                     getAvatarUrl: () => {
                         return "avatar.jpeg";
                     },
+                    getMxcAvatarUrl: () => 'mxc://avatar.url/image.png',
                 },
                 ts: ts0 + 5,
                 mship: 'invite',
diff --git a/test/components/views/elements/MemberEventListSummary-test.js b/test/components/views/elements/MemberEventListSummary-test.js
index 6d26fa36e9..dd6febc7d7 100644
--- a/test/components/views/elements/MemberEventListSummary-test.js
+++ b/test/components/views/elements/MemberEventListSummary-test.js
@@ -50,6 +50,7 @@ describe('MemberEventListSummary', function() {
                 getAvatarUrl: () => {
                     return "avatar.jpeg";
                 },
+                getMxcAvatarUrl: () => 'mxc://avatar.url/image.png',
             },
         });
         // Override random event ID to allow for equality tests against tiles from
diff --git a/test/components/views/messages/TextualBody-test.js b/test/components/views/messages/TextualBody-test.js
index a596825c09..0a6d47a72b 100644
--- a/test/components/views/messages/TextualBody-test.js
+++ b/test/components/views/messages/TextualBody-test.js
@@ -37,6 +37,7 @@ describe("<TextualBody />", () => {
             getRoom: () => mkStubRoom("room_id"),
             getAccountData: () => undefined,
             isGuest: () => false,
+            mxcUrlToHttp: (s) => s,
         };
 
         const ev = mkEvent({
@@ -61,6 +62,7 @@ describe("<TextualBody />", () => {
             getRoom: () => mkStubRoom("room_id"),
             getAccountData: () => undefined,
             isGuest: () => false,
+            mxcUrlToHttp: (s) => s,
         };
 
         const ev = mkEvent({
@@ -86,6 +88,7 @@ describe("<TextualBody />", () => {
                 getRoom: () => mkStubRoom("room_id"),
                 getAccountData: () => undefined,
                 isGuest: () => false,
+                mxcUrlToHttp: (s) => s,
             };
         });
 
@@ -139,6 +142,7 @@ describe("<TextualBody />", () => {
                 on: () => undefined,
                 removeListener: () => undefined,
                 isGuest: () => false,
+                mxcUrlToHttp: (s) => s,
             };
         });
 
@@ -284,6 +288,7 @@ describe("<TextualBody />", () => {
             getAccountData: () => undefined,
             getUrlPreview: (url) => new Promise(() => {}),
             isGuest: () => false,
+            mxcUrlToHttp: (s) => s,
         };
 
         const ev = mkEvent({
diff --git a/test/setupTests.js b/test/setupTests.js
index 9c2d16a8df..6d37d48987 100644
--- a/test/setupTests.js
+++ b/test/setupTests.js
@@ -2,3 +2,5 @@ import * as languageHandler from "../src/languageHandler";
 
 languageHandler.setLanguage('en');
 languageHandler.setMissingEntryGenerator(key => key.split("|", 2)[1]);
+
+require('jest-fetch-mock').enableMocks();
diff --git a/test/test-utils.js b/test/test-utils.js
index b6e0468d86..d259fcb95f 100644
--- a/test/test-utils.js
+++ b/test/test-utils.js
@@ -213,6 +213,7 @@ export function mkStubRoom(roomId = null) {
             rawDisplayName: 'Member',
             roomId: roomId,
             getAvatarUrl: () => 'mxc://avatar.url/image.png',
+            getMxcAvatarUrl: () => 'mxc://avatar.url/image.png',
         }),
         getMembersWithMembership: jest.fn().mockReturnValue([]),
         getJoinedMembers: jest.fn().mockReturnValue([]),
@@ -242,6 +243,7 @@ export function mkStubRoom(roomId = null) {
         removeListener: jest.fn(),
         getDMInviter: jest.fn(),
         getAvatarUrl: () => 'mxc://avatar.url/room.png',
+        getMxcAvatarUrl: () => 'mxc://avatar.url/room.png',
     };
 }
 
diff --git a/yarn.lock b/yarn.lock
index f99ea5900d..89ad76638f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2589,6 +2589,13 @@ crc-32@^0.3.0:
   resolved "https://registry.yarnpkg.com/crc-32/-/crc-32-0.3.0.tgz#6a3d3687f5baec41f7e9b99fe1953a2e5d19775e"
   integrity sha1-aj02h/W67EH36bmf4ZU6Ll0Zd14=
 
+cross-fetch@^3.0.4:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.0.6.tgz#3a4040bc8941e653e0e9cf17f29ebcd177d3365c"
+  integrity sha512-KBPUbqgFjzWlVcURG+Svp9TlhA5uliYtiNx/0r8nv0pdypeQCRJ9IaSIc3q/x3q8t3F75cHuwxVql1HFGHCNJQ==
+  dependencies:
+    node-fetch "2.6.1"
+
 cross-spawn@^6.0.0, cross-spawn@^6.0.5:
   version "6.0.5"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
@@ -4918,6 +4925,14 @@ jest-environment-node@^26.6.2:
     jest-mock "^26.6.2"
     jest-util "^26.6.2"
 
+jest-fetch-mock@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/jest-fetch-mock/-/jest-fetch-mock-3.0.3.tgz#31749c456ae27b8919d69824f1c2bd85fe0a1f3b"
+  integrity sha512-Ux1nWprtLrdrH4XwE7O7InRY6psIi3GOsqNESJgMJ+M5cv4A8Lh7SN9d2V2kKRZ8ebAfcd1LNyZguAOb6JiDqw==
+  dependencies:
+    cross-fetch "^3.0.4"
+    promise-polyfill "^8.1.3"
+
 jest-get-type@^26.3.0:
   version "26.3.0"
   resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz#e97dc3c3f53c2b406ca7afaed4493b1d099199e0"
@@ -5835,6 +5850,11 @@ nice-try@^1.0.4:
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
   integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
+node-fetch@2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
+  integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
+
 node-fetch@^1.0.1:
   version "1.7.3"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef"
@@ -6448,6 +6468,11 @@ progress@^2.0.0:
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
   integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
 
+promise-polyfill@^8.1.3:
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/promise-polyfill/-/promise-polyfill-8.2.0.tgz#367394726da7561457aba2133c9ceefbd6267da0"
+  integrity sha512-k/TC0mIcPVF6yHhUvwAp7cvL6I2fFV7TzF1DuGPI8mBh4QQazf36xCKEHKTZKRysEoTQoQdKyP25J8MPJp7j5g==
+
 promise@^7.0.3, promise@^7.1.1:
   version "7.3.1"
   resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"

From a1eabde3a36b11fb3da2469b04f0b1a5b3d6dbe9 Mon Sep 17 00:00:00 2001
From: Panagiotis <27917356+panoschal@users.noreply.github.com>
Date: Thu, 11 Mar 2021 19:14:04 +0200
Subject: [PATCH 275/420] fix: create a PillCandidatePart on the beginning of a
 part string

---
 src/editor/parts.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/editor/parts.ts b/src/editor/parts.ts
index 67f6a2c0c5..ccd90da3e2 100644
--- a/src/editor/parts.ts
+++ b/src/editor/parts.ts
@@ -189,7 +189,13 @@ abstract class PlainBasePart extends BasePart {
             if (chr !== "@" && chr !== "#" && chr !== ":" && chr !== "+") {
                 return true;
             }
-            // only split if the previous character is a space
+
+            // split if we are at the beginning of the part text
+            if (offset === 0) {
+                return false;
+            }
+
+            // or split if the previous character is a space
             // or if it is a + and this is a :
             return this._text[offset - 1] !== " " &&
                 (this._text[offset - 1] !== "+" || chr !== ":");

From 62fa60f1093faad3c5374ef3f881dcd5781f085b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Thu, 11 Mar 2021 08:29:03 +0100
Subject: [PATCH 276/420] Use resourceId in formatted body
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 src/editor/serialize.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/editor/serialize.ts b/src/editor/serialize.ts
index c1f4da306b..40ff4b59f5 100644
--- a/src/editor/serialize.ts
+++ b/src/editor/serialize.ts
@@ -34,6 +34,10 @@ export function mdSerialize(model: EditorModel) {
             case "at-room-pill":
                 return html + part.text;
             case "room-pill":
+                // Here we use the resourceId for compatibility with non-rich text clients
+                // See https://github.com/vector-im/element-web/issues/16660
+                return html +
+                    `[${part.resourceId.replace(/[[\\\]]/g, c => "\\" + c)}](${makeGenericPermalink(part.resourceId)})`;
             case "user-pill":
                 return html +
                     `[${part.text.replace(/[[\\\]]/g, c => "\\" + c)}](${makeGenericPermalink(part.resourceId)})`;

From d4f67d94a4ec1d2115d9b6fc150db698c9d9ceae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Thu, 11 Mar 2021 18:50:35 +0100
Subject: [PATCH 277/420] Use resourceId in plain body
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 src/editor/serialize.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/editor/serialize.ts b/src/editor/serialize.ts
index 40ff4b59f5..d43cb4f38d 100644
--- a/src/editor/serialize.ts
+++ b/src/editor/serialize.ts
@@ -101,6 +101,9 @@ export function textSerialize(model: EditorModel) {
             case "at-room-pill":
                 return text + part.text;
             case "room-pill":
+                // Here we use the resourceId for compatibility with non-rich text clients
+                // See https://github.com/vector-im/element-web/issues/16660
+                return text + `${part.resourceId}`;
             case "user-pill":
                 return text + `${part.text}`;
         }

From 37b6162c2550eadec74dfb93cc54cdedc58fe274 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Thu, 11 Mar 2021 08:29:03 +0100
Subject: [PATCH 278/420] Use resourceId in formatted body
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 src/editor/serialize.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/editor/serialize.ts b/src/editor/serialize.ts
index c1f4da306b..40ff4b59f5 100644
--- a/src/editor/serialize.ts
+++ b/src/editor/serialize.ts
@@ -34,6 +34,10 @@ export function mdSerialize(model: EditorModel) {
             case "at-room-pill":
                 return html + part.text;
             case "room-pill":
+                // Here we use the resourceId for compatibility with non-rich text clients
+                // See https://github.com/vector-im/element-web/issues/16660
+                return html +
+                    `[${part.resourceId.replace(/[[\\\]]/g, c => "\\" + c)}](${makeGenericPermalink(part.resourceId)})`;
             case "user-pill":
                 return html +
                     `[${part.text.replace(/[[\\\]]/g, c => "\\" + c)}](${makeGenericPermalink(part.resourceId)})`;

From 5b65f367d3a9203d0383a5257e622a7e176ba000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Thu, 11 Mar 2021 18:50:35 +0100
Subject: [PATCH 279/420] Use resourceId in plain body
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 src/editor/serialize.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/editor/serialize.ts b/src/editor/serialize.ts
index 40ff4b59f5..d43cb4f38d 100644
--- a/src/editor/serialize.ts
+++ b/src/editor/serialize.ts
@@ -101,6 +101,9 @@ export function textSerialize(model: EditorModel) {
             case "at-room-pill":
                 return text + part.text;
             case "room-pill":
+                // Here we use the resourceId for compatibility with non-rich text clients
+                // See https://github.com/vector-im/element-web/issues/16660
+                return text + `${part.resourceId}`;
             case "user-pill":
                 return text + `${part.text}`;
         }

From 02051a39ff126d8ea4f328ed705ec5d2fc573d24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Fri, 12 Mar 2021 13:55:14 +0100
Subject: [PATCH 280/420] Hangup all calls on logout
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 src/CallHandler.tsx                      | 5 +++++
 src/components/structures/MatrixChat.tsx | 1 +
 2 files changed, 6 insertions(+)

diff --git a/src/CallHandler.tsx b/src/CallHandler.tsx
index d2564e637b..ce779f12a5 100644
--- a/src/CallHandler.tsx
+++ b/src/CallHandler.tsx
@@ -788,6 +788,11 @@ export default class CallHandler {
                 // don't remove the call yet: let the hangup event handler do it (otherwise it will throw
                 // the hangup event away)
                 break;
+            case 'hangup_all':
+                for (const call of this.calls.values()) {
+                    call.hangup(CallErrorCode.UserHangup, false);
+                }
+                break;
             case 'answer': {
                 if (!this.calls.has(payload.room_id)) {
                     return; // no call to answer
diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index 0272633e8f..f0a3778a2b 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -582,6 +582,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 }
                 break;
             case 'logout':
+                dis.dispatch({action: "hangup_all"});
                 Lifecycle.logout();
                 break;
             case 'require_registration':

From 86e13eeba6219d2946fdc39e527f8e80ed0a9af1 Mon Sep 17 00:00:00 2001
From: libexus <Asterixeins324@gmail.com>
Date: Fri, 12 Mar 2021 17:04:10 +0000
Subject: [PATCH 281/420] Translated using Weblate (German)

Currently translated at 96.7% (2795 of 2889 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
---
 src/i18n/strings/de_DE.json | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 65e08ae4c3..945d07bfbd 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -2971,7 +2971,7 @@
     "You've reached the maximum number of simultaneous calls.": "Du hast die maximale Anzahl gleichzeitiger Anrufe erreicht.",
     "Too Many Calls": "Zu viele Anrufe",
     "Call failed because webcam or microphone could not be accessed. Check that:": "Der Anruf ist fehlgeschlagen, weil nicht auf die Webcam oder der das Mikrofon zugegriffen werden konnte. Prüfe nach, ob:",
-    "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "Der Anruf ist fehlgeschlagen, weil nicht auf das Mikrofon zugegriffen werden konnte. Prüfe noch einmal nach, ob das Mikrofon eingesteckt und richtig eingestellt ist.",
+    "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "Der Anruf hat fehlgeschlagen, weil nicht auf das Mikrofon zugegriffen werden konnte. Prüfe noch einmal nach, ob das Mikrofon angesteckt und richtig konfiguriert ist.",
     "You have no visible notifications.": "Du hast keine sichtbaren Benachrichtigungen.",
     "%(name)s on hold": "%(name)s wird gehalten",
     "You held the call <a>Switch</a>": "Du hältst den Anruf <a>Wechseln</a>",
@@ -3078,5 +3078,18 @@
     "Value in this room": "Wert in diesem Raum",
     "Settings Explorer": "Einstellungs-Explorer",
     "Values at explicit levels": "Werte für explizite Levels",
-    "Settable at room": "Für den Raum einstellbar"
+    "Settable at room": "Für den Raum einstellbar",
+    "Room name": "Raumname",
+    "%(count)s members|other": "%(count)s Mitglieder",
+    "Accept Invite": "Einladung akzeptieren",
+    "Save changes": "Änderungen speichern",
+    "Undo": "Rückgängig",
+    "Save Changes": "Änderungen Speichern",
+    "View dev tools": "Entwicklereinstellungen anzeigen",
+    "Apply": "Anwenden",
+    "Create a new room": "Neuen Raum erstellen",
+    "Suggested Rooms": "Vorgeschlagene Räume",
+    "Add existing room": "Bereits existierenden Raum hinzufügen",
+    "Send message": "Nachricht senden",
+    "New room": "Neuer Raum"
 }

From 4e267da6add6299652122e270a238dc68f118e53 Mon Sep 17 00:00:00 2001
From: Sven Grewe <svengrewe@posteo.de>
Date: Fri, 12 Mar 2021 16:57:30 +0000
Subject: [PATCH 282/420] Translated using Weblate (German)

Currently translated at 96.7% (2795 of 2889 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
---
 src/i18n/strings/de_DE.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 945d07bfbd..291e180eeb 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1317,7 +1317,7 @@
     "Enter a new identity server": "Gib einen neuen Identitätsserver ein",
     "Clear personal data": "Persönliche Daten löschen",
     "Disconnecting from your identity server will mean you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Wenn du die Verbindung zu deinem Identitätsserver trennst, heißt das, dass du nicht mehr von anderen Benutzern gefunden werden und auch andere nicht mehr per E-Mail oder Telefonnummer einladen kannst.",
-    "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Bitte frage die Administration deines Heimservers (<code>%(homeserverDomain)s</code>) darum, einen TURN-Server einzurichten, damit Anrufe zuverlässig funktionieren.",
+    "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Bitte frage den Administrator deines Heimservers (<code>%(homeserverDomain)s</code>) darum, einen TURN-Server einzurichten, damit Anrufe zuverlässig funktionieren.",
     "Disconnect from the identity server <idserver />?": "Verbindung zum Identitätsserver <idserver /> trennen?",
     "Add Email Address": "E-Mail-Adresse hinzufügen",
     "Add Phone Number": "Telefonnummer hinzufügen",
@@ -1416,7 +1416,7 @@
     "View rules": "Regeln öffnen",
     "You are currently subscribed to:": "Du abonnierst momentan:",
     "⚠ These settings are meant for advanced users.": "⚠ Diese Einstellungen sind für fortgeschrittene Nutzer:innen gedacht.",
-    "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Ob du %(brand)s auf einem Gerät verwendest, bei dem Touch das primäre Eingabegerät ist",
+    "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Ob du %(brand)s auf einem Gerät verwendest, bei dem das Tasten die primäre Eingabemöglichkeit ist",
     "Whether you're using %(brand)s as an installed Progressive Web App": "Ob du %(brand)s als installierte progressive Web-App verwendest",
     "Your user agent": "Dein User-Agent",
     "If you cancel now, you won't complete verifying the other user.": "Wenn Sie jetzt abbrechen, werden Sie die Verifizierung des anderen Nutzers nicht beenden können.",
@@ -1633,11 +1633,11 @@
     "Sends a message as html, without interpreting it as markdown": "Verschickt eine Nachricht im HTML-Format, ohne sie als Markdown zu darzustellen",
     "Show rooms with unread notifications first": "Räume mit ungelesenen Benachrichtigungen zuerst zeigen",
     "Show shortcuts to recently viewed rooms above the room list": "Kurzbefehle zu den kürzlich gesichteten Räumen über der Raumliste anzeigen",
-    "Use Single Sign On to continue": "Single-Sign-On zum Fortfahren nutzen",
-    "Confirm adding this email address by using Single Sign On to prove your identity.": "Bestätige die hinzugefügte E-Mail-Adresse mit Single Sign-On, um deine Identität nachzuweisen.",
-    "Single Sign On": "Single Sign-On",
+    "Use Single Sign On to continue": "Einmal-Anmeldung zum Fortfahren nutzen",
+    "Confirm adding this email address by using Single Sign On to prove your identity.": "Bestätige die hinzugefügte E-Mail-Adresse mit der Einmal-Anmeldung, um deine Identität nachzuweisen.",
+    "Single Sign On": "Einmal-Anmeldung",
     "Confirm adding email": "Hinzugefügte E-Mail-Addresse bestätigen",
-    "Confirm adding this phone number by using Single Sign On to prove your identity.": "Bestätige die hinzugefügte Telefonnummer, 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 die hinzugefügte Telefonnummer, indem du deine Identität mittels der Einmal-Anmeldung nachweist.",
     "Click the button below to confirm adding this phone number.": "Klicke unten die Schaltfläche, um die hinzugefügte Telefonnummer zu bestätigen.",
     "If you cancel now, you won't complete your operation.": "Wenn du jetzt abbrichst, wirst du deinen Vorgang nicht fertigstellen.",
     "%(name)s is requesting verification": "%(name)s fordert eine Verifizierung an",

From 442122564fcdcc47390d0fb26db708c965cad8dc Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Wed, 10 Mar 2021 21:46:14 +0000
Subject: [PATCH 283/420] Translated using Weblate (German)

Currently translated at 96.7% (2795 of 2889 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
---
 src/i18n/strings/de_DE.json | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 291e180eeb..52d92186d2 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -3091,5 +3091,24 @@
     "Suggested Rooms": "Vorgeschlagene Räume",
     "Add existing room": "Bereits existierenden Raum hinzufügen",
     "Send message": "Nachricht senden",
-    "New room": "Neuer Raum"
+    "New room": "Neuer Raum",
+    "Share invite link": "Einladungslink teilen",
+    "Click to copy": "Klicken um zu kopieren",
+    "Collapse space panel": "Space-Feld zuklappen",
+    "Expand space panel": "Space-Feld aufweiten",
+    "Creating...": "Erstelle...",
+    "You can change these at any point.": "Du kannst diese jederzeit ändern.",
+    "Your private space": "Dein privater Space",
+    "Your public space": "Dein öffentlicher Space",
+    "You can change this later": "Du kannst dies später ändern",
+    "Invite only, best for yourself or teams": "Nur Einladen - am Besten für dich selbst oder Teams",
+    "Open space for anyone, best for communities": "Öffne den Space für alle - am Besten für Communities",
+    "Private": "Privat",
+    "Public": "Öffentlich",
+    "Spaces are new ways to group rooms and people. To join an existing space you’ll need an invite": "Spaces sind ein neuer Weg Räume und Leute zu gruppieren. Um einen bestehenden Space zu betreten brauchst du eine Einladung",
+    "Create a space": "Einen Space erstellen",
+    "Delete": "Löschen",
+    "This homeserver has been blocked by its administrator.": "Dieser Heimserver wurde von ihrer Administration geblockt.",
+    "You're already in a call with this person.": "Du bist schon in einem Anruf mit dieser Person.",
+    "Already in call": "Schon im Anruf"
 }

From 6210614ce7138f871818df4941cdd04d65e6cc1d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 12 Mar 2021 17:37:15 +0000
Subject: [PATCH 284/420] Rebuild space panel layout to resolve weirdness with
 selections and nesting

---
 res/css/structures/_SpacePanel.scss | 42 ++++++++---------------------
 1 file changed, 11 insertions(+), 31 deletions(-)

diff --git a/res/css/structures/_SpacePanel.scss b/res/css/structures/_SpacePanel.scss
index 9937117086..4ced807f66 100644
--- a/res/css/structures/_SpacePanel.scss
+++ b/res/css/structures/_SpacePanel.scss
@@ -16,9 +16,8 @@ limitations under the License.
 
 $topLevelHeight: 32px;
 $nestedHeight: 24px;
-$gutterSize: 17px;
-$activeStripeSize: 4px;
-$activeBorderTransparentGap: 2px;
+$gutterSize: 16px;
+$activeBorderTransparentGap: 1px;
 
 $activeBackgroundColor: $roomtile-selected-bg-color;
 $activeBorderColor: $secondary-fg-color;
@@ -102,14 +101,11 @@ $activeBorderColor: $secondary-fg-color;
         &.mx_SpaceButton_active {
             &:not(.mx_SpaceButton_narrow) .mx_SpaceButton_selectionWrapper {
                 background-color: $activeBackgroundColor;
-                border-radius: 8px;
             }
 
-            &.mx_SpaceButton_narrow {
-                .mx_BaseAvatar, .mx_SpaceButton_avatarPlaceholder {
-                    border: 2px $activeBorderColor solid;
-                    border-radius: 11px;
-                }
+            &.mx_SpaceButton_narrow .mx_SpaceButton_selectionWrapper {
+                padding: $activeBorderTransparentGap;
+                border: 3px $activeBorderColor solid;
             }
         }
 
@@ -117,6 +113,8 @@ $activeBorderColor: $secondary-fg-color;
             display: flex;
             flex: 1;
             align-items: center;
+            border-radius: 12px;
+            padding: 4px;
         }
 
         .mx_SpaceButton_name {
@@ -133,8 +131,8 @@ $activeBorderColor: $secondary-fg-color;
         }
 
         .mx_SpaceButton_toggleCollapse {
-            width: calc($gutterSize - $activeStripeSize);
-            margin-left: 1px;
+            width: $gutterSize;
+            margin-right: -4px;
             height: 20px;
             mask-position: center;
             mask-size: 20px;
@@ -172,11 +170,6 @@ $activeBorderColor: $secondary-fg-color;
             }
         }
 
-        .mx_SpaceButton_avatarPlaceholder {
-            border: $activeBorderTransparentGap transparent solid;
-            padding: $activeBorderTransparentGap;
-        }
-
         &.mx_SpaceButton_new .mx_SpaceButton_icon {
             background-color: $accent-color;
             transition: all .1s ease-in-out; // TODO transition
@@ -196,21 +189,8 @@ $activeBorderColor: $secondary-fg-color;
             }
         }
 
-        .mx_BaseAvatar {
-            /* moving the border-radius to this element from _image
-            element so we can add a border to it without the initials being displaced */
-            overflow: hidden;
-            border: 2px transparent solid;
-            padding: $activeBorderTransparentGap;
-
-            .mx_BaseAvatar_initial {
-                top: $activeBorderTransparentGap;
-                left: $activeBorderTransparentGap;
-            }
-
-            .mx_BaseAvatar_image {
-                border-radius: 8px;
-            }
+        .mx_BaseAvatar_image {
+            border-radius: 8px;
         }
 
         .mx_SpaceButton_menuButton {

From 7854cef727d3c0e653970a0d830519a212c098b8 Mon Sep 17 00:00:00 2001
From: Sven Grewe <svengrewe@posteo.de>
Date: Fri, 12 Mar 2021 17:47:17 +0000
Subject: [PATCH 285/420] Translated using Weblate (German)

Currently translated at 96.7% (2795 of 2889 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
---
 src/i18n/strings/de_DE.json | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 52d92186d2..fd416391ab 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -131,7 +131,7 @@
     "Jun": "Jun",
     "Jul": "Juli",
     "Aug": "Aug",
-    "Sep": "Sept",
+    "Sep": "Sep",
     "Oct": "Okt",
     "Nov": "Nov",
     "Dec": "Dez",
@@ -181,7 +181,7 @@
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s hat die Verbannung von %(targetName)s aufgehoben.",
     "Usage": "Verwendung",
     "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s hat die Einladung für %(targetName)s zurückgezogen.",
-    "You need to be able to invite users to do that.": "Du musst die Berechtigung \"Benutzer:innen einladen\" haben, um diese Aktion ausführen zu können.",
+    "You need to be able to invite users to do that.": "Du musst die Berechtigung \"Benutzer einladen\" haben, um diese Aktion ausführen zu können.",
     "You need to be logged in.": "Du musst angemeldet sein.",
     "There are no visible files in this room": "Es gibt keine sichtbaren Dateien in diesem Raum",
     "Connectivity to the server has been lost.": "Verbindung zum Server wurde unterbrochen.",
@@ -285,7 +285,7 @@
     "Error decrypting video": "Video-Entschlüsselung fehlgeschlagen",
     "Import room keys": "Raum-Schlüssel importieren",
     "File to import": "Zu importierende Datei",
-    "Failed to invite the following users to the %(roomName)s room:": "Folgende Benutzer:innen konnten nicht in den Raum \"%(roomName)s\" eingeladen werden:",
+    "Failed to invite the following users to the %(roomName)s room:": "Folgende Benutzer konnten nicht in den Raum \"%(roomName)s\" eingeladen werden:",
     "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.": "Bist du sicher, dass du dieses Ereignis entfernen (löschen) möchtest? Wenn du die Änderung eines Raum-Namens oder eines Raum-Themas löscht, kann dies dazu führen, dass die ursprüngliche Änderung rückgängig gemacht wird.",
     "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.": "Dieser Prozess erlaubt es dir, die Schlüssel für die in verschlüsselten Räumen empfangenen Nachrichten in eine lokale Datei zu exportieren. In Zukunft wird es möglich sein, diese Datei in einen anderen Matrix-Client zu importieren, sodass dieser Client diese Nachrichten ebenfalls entschlüsseln kann.",
     "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.": "Mit der exportierten Datei kann jeder, der diese Datei lesen kann, jede verschlüsselte Nachricht entschlüsseln, die für dich lesbar ist. Du solltest die Datei also unbedingt sicher verwahren. Um den Vorgang sicherer zu gestalten, solltest du unten eine Passphrase eingeben, die dazu verwendet wird, die exportierten Daten zu verschlüsseln. Anschließend wird es nur möglich sein, die Daten zu importieren, wenn dieselbe Passphrase verwendet wird.",
@@ -416,7 +416,7 @@
     "You are now ignoring %(userId)s": "%(userId)s wird jetzt ignoriert",
     "You are no longer ignoring %(userId)s": "%(userId)s wird nicht mehr ignoriert",
     "Leave": "Verlassen",
-    "Failed to invite the following users to %(groupId)s:": "Die folgenden Benutzer:innen konnten nicht in die Gruppe %(groupId)s eingeladen werden:",
+    "Failed to invite the following users to %(groupId)s:": "Die folgenden Benutzer konnten nicht in die Gruppe %(groupId)s eingeladen werden:",
     "Leave %(groupName)s?": "%(groupName)s verlassen?",
     "Add a Room": "Raum hinzufügen",
     "Add a User": "Benutzer:in hinzufügen",
@@ -430,7 +430,7 @@
     "Banned by %(displayName)s": "Verbannt von %(displayName)s",
     "Description": "Beschreibung",
     "Unable to accept invite": "Einladung kann nicht angenommen werden",
-    "Failed to invite users to %(groupId)s": "Benutzer:innen konnten nicht in %(groupId)s eingeladen werden",
+    "Failed to invite users to %(groupId)s": "Benutzer konnten nicht in %(groupId)s eingeladen werden",
     "Unable to reject invite": "Einladung konnte nicht abgelehnt werden",
     "Who would you like to add to this summary?": "Wen möchtest zu dieser Übersicht hinzufügen?",
     "Add to summary": "Zur Übersicht hinzufügen",
@@ -469,7 +469,7 @@
     "Which rooms would you like to add to this community?": "Welche Räume sollen zu dieser Community hinzugefügt werden?",
     "Add rooms to the community": "Räume zur Community hinzufügen",
     "Add to community": "Zur Community hinzufügen",
-    "Failed to invite users to community": "Benutzer:innen konnten nicht in die Community eingeladen werden",
+    "Failed to invite users to community": "Benutzer konnten nicht in die Community eingeladen werden",
     "Communities": "Communities",
     "Invalid community ID": "Ungültige Community-ID",
     "'%(groupId)s' is not a valid community ID": "'%(groupId)s' ist keine gültige Community-ID",
@@ -628,7 +628,7 @@
     "Your language of choice": "Deine ausgewählte Sprache",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Ob du den Richtext-Modus des Editors benutzt oder nicht",
     "Your homeserver's URL": "Deine Homeserver-URL",
-    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s. %(monthName)s %(fullYear)s",
     "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Du wirst nicht in der Lage sein, die Änderung zurückzusetzen, da du dich degradierst. Wenn du der/die letze Nutzer:in mit Berechtigungen bist, wird es unmöglich sein die Privilegien zurückzubekommen.",
     "Community IDs cannot be empty.": "Community-IDs können nicht leer sein.",
     "Learn more about how we use analytics.": "Lerne mehr darüber, wie wir die Analysedaten nutzen.",
@@ -925,7 +925,7 @@
     "You do not have permission to invite people to this room.": "Du hast keine Berechtigung um Personen in diesen Raum einzuladen.",
     "User %(user_id)s does not exist": "Benutzer:in %(user_id)s existiert nicht",
     "Unknown server error": "Unbekannter Serverfehler",
-    "Failed to invite users to the room:": "Konnte Benutzer:innen nicht in den Raum einladen:",
+    "Failed to invite users to the room:": "Konnte Benutzer nicht in den Raum einladen:",
     "Short keyboard patterns are easy to guess": "Kurze Tastaturmuster sind einfach zu erraten",
     "Show a reminder to enable Secure Message Recovery in encrypted rooms": "Zeige eine Erinnerung um die Sichere Nachrichten-Wiederherstellung in verschlüsselten Räumen zu aktivieren",
     "Messages containing @room": "Nachrichten, die \"@room\" enthalten",
@@ -1330,7 +1330,7 @@
     "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.": "Wenn du den gesuchten Raum nicht finden kannst, frage nach einer Einladung für den Raum oder <a>Erstelle einen neuen Raum</a>.",
     "Alternatively, you can try to use the public server at <code>turn.matrix.org</code>, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings.": "Alternativ kannst du versuchen, den öffentlichen Server unter <code>turn.matrix.org</code> zu verwenden. Allerdings wird dieser nicht so zuverlässig sein und du teilst deine IP-Adresse mit diesem Server. Du kannst dies auch in den Einstellungen konfigurieren.",
     "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.": "Diese Handlung erfordert es, auf den Standard-Identitätsserver <server /> zuzugreifen, um eine E-Mail Adresse oder Telefonnummer zu validieren, aber der Server hat keine Nutzungsbedingungen.",
-    "Only continue if you trust the owner of the server.": "Fahre nur fort, wenn du dem/r Besitzer:in des Servers vertraust.",
+    "Only continue if you trust the owner of the server.": "Fahre nur fort, wenn du dem Besitzer des Servers vertraust.",
     "Trust": "Vertrauen",
     "Custom (%(level)s)": "Benutzerdefinierte (%(level)s)",
     "Sends a message as plain text, without interpreting it as markdown": "Verschickt eine Nachricht in Rohtext, ohne sie als Markdown darzustellen",
@@ -1496,9 +1496,9 @@
     "Enter your password to sign in and regain access to your account.": "Gib dein Passwort ein, um dich anzumelden und wieder Zugang zu deinem Konto zu erhalten.",
     "Sign in and regain access to your account.": "Melden dich an und erhalte wieder Zugang zu deinem Konto.",
     "You cannot sign in to your account. Please contact your homeserver admin for more information.": "Du kannst dich nicht bei deinem Konto anmelden. Bitte kontaktiere deine Homeserver-Administration für weitere Informationen.",
-    "Sign In or Create Account": "Anmelden oder Account erstellen",
-    "Use your account or create a new one to continue.": "Benutze deinen Account oder erstellen einen neuen, um fortzufahren.",
-    "Create Account": "Account erstellen",
+    "Sign In or Create Account": "Anmelden oder Konto erstellen",
+    "Use your account or create a new one to continue.": "Benutze dein Konto oder erstelle ein neues, um fortzufahren.",
+    "Create Account": "Konto erstellen",
     "Show typing notifications": "Zeige Tipp-Benachrichtigungen",
     "Order rooms by name": "Sortiere Räume nach Name",
     "When rooms are upgraded": "Wenn Räume verbessert werden",
@@ -2971,7 +2971,7 @@
     "You've reached the maximum number of simultaneous calls.": "Du hast die maximale Anzahl gleichzeitiger Anrufe erreicht.",
     "Too Many Calls": "Zu viele Anrufe",
     "Call failed because webcam or microphone could not be accessed. Check that:": "Der Anruf ist fehlgeschlagen, weil nicht auf die Webcam oder der das Mikrofon zugegriffen werden konnte. Prüfe nach, ob:",
-    "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "Der Anruf hat fehlgeschlagen, weil nicht auf das Mikrofon zugegriffen werden konnte. Prüfe noch einmal nach, ob das Mikrofon angesteckt und richtig konfiguriert ist.",
+    "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "Der Anruf ist fehlgeschlagen, weil nicht auf das Mikrofon zugegriffen werden konnte. Prüfe noch einmal nach, ob das Mikrofon angesteckt und richtig konfiguriert ist.",
     "You have no visible notifications.": "Du hast keine sichtbaren Benachrichtigungen.",
     "%(name)s on hold": "%(name)s wird gehalten",
     "You held the call <a>Switch</a>": "Du hältst den Anruf <a>Wechseln</a>",
@@ -3040,8 +3040,8 @@
     "Use app for a better experience": "Nutze die App für eine bessere Erfahrung",
     "We asked the browser to remember which homeserver you use to let you sign in, but unfortunately your browser has forgotten it. Go to the sign in page and try again.": "Wir haben deinen Browser gebeten, sich zu merken, bei welchem Homeserver du dich anmeldest, aber dein Browser hat dies leider vergessen. Gehe zur Anmeldeseite und versuche es erneut.",
     "Show stickers button": "Sticker-Schaltfläche anzeigen",
-    "Your homeserver rejected your log in attempt. This could be due to things just taking too long. Please try again. If this continues, please contact your homeserver administrator.": "Dein Homeserver hat deinen Anmeldeversuch abgelehnt. Dies könnte daran liegen, dass der Prozess einfach zu lange dauert. Bitte versuche es erneut. Wenn dies so weitergeht, wende dich bitte an deine Homeserver-Administration.",
-    "Your homeserver was unreachable and was not able to log you in. Please try again. If this continues, please contact your homeserver administrator.": "Dein Homeserver war nicht erreichbar und konnte dich nicht anmelden. Bitte versuche es erneut. Wenn dies so weitergeht, wende dich bitte an deine Homeserver-Administration.",
+    "Your homeserver rejected your log in attempt. This could be due to things just taking too long. Please try again. If this continues, please contact your homeserver administrator.": "Dein Homeserver hat deinen Anmeldeversuch abgelehnt. Dies könnte daran liegen, dass der Prozess einfach zu lange dauert. Bitte versuche es erneut. Wenn dies so weitergeht, wende dich bitte an deine Homeserver-Administrator.",
+    "Your homeserver was unreachable and was not able to log you in. Please try again. If this continues, please contact your homeserver administrator.": "Dein Homeserver war nicht erreichbar und konnte dich nicht anmelden. Bitte versuche es erneut. Wenn dies so weitergeht, wende dich bitte an deinem Homeserver-Administrator.",
     "We couldn't log you in": "Wir konnten dich nicht anmelden",
     "Windows": "Fenster",
     "Screens": "Bildschirme",

From 3e50b12548ae6a42c826bb45bc3617fa196303a4 Mon Sep 17 00:00:00 2001
From: libexus <Asterixeins324@gmail.com>
Date: Fri, 12 Mar 2021 17:18:45 +0000
Subject: [PATCH 286/420] Translated using Weblate (German)

Currently translated at 96.7% (2795 of 2889 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-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 fd416391ab..1780708e55 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -108,7 +108,7 @@
     "This email address was not found": "Diese E-Mail-Adresse konnte nicht gefunden werden",
     "The remote side failed to pick up": "Die Gegenstelle konnte nicht abheben",
     "This phone number is already in use": "Diese Telefonnummer wird bereits verwendet",
-    "Unable to capture screen": "Der Bildschirm konnte nicht aufgenommen werden",
+    "Unable to capture screen": "Der Bildschirm kann nicht aufgenommen werden",
     "Unable to enable Notifications": "Benachrichtigungen konnten nicht aktiviert werden",
     "Upload Failed": "Upload fehlgeschlagen",
     "VoIP is unsupported": "VoIP wird nicht unterstützt",
@@ -129,7 +129,7 @@
     "Apr": "April",
     "May": "Mai",
     "Jun": "Jun",
-    "Jul": "Juli",
+    "Jul": "Jul",
     "Aug": "Aug",
     "Sep": "Sep",
     "Oct": "Okt",
@@ -1233,7 +1233,7 @@
     "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",
-    "Name or Matrix ID": "Name oder Matrix ID",
+    "Name or Matrix ID": "Name oder Matrix-ID",
     "Your %(brand)s is misconfigured": "Dein %(brand)s ist falsch konfiguriert",
     "You cannot modify widgets in this room.": "Du darfst in diesem Raum keine Widgets verändern.",
     "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Ob du die \"Breadcrumbs\"-Funktion nutzt oder nicht (Avatare oberhalb der Raumliste)",

From c8d7b0e1b9baca45b0c1570370403b037b64d728 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 12 Mar 2021 14:56:47 -0700
Subject: [PATCH 287/420] Collapse copyright

---
 src/components/structures/MatrixChat.tsx | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index 99397640ed..d3e0778e82 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -1,8 +1,5 @@
 /*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2017 Vector Creations Ltd
-Copyright 2017-2019 New Vector Ltd
-Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
+Copyright 2015-2019-2021 The Matrix.org Foundation C.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 75cfd9a8f596af114f20011896d47a00a4c4082e Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 12 Mar 2021 15:01:05 -0700
Subject: [PATCH 288/420] Redirect to login properly

---
 src/components/structures/MatrixChat.tsx | 31 +++++++++++++-----------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index d3e0778e82..dab75be46e 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -604,12 +604,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 if (payload.screenAfterLogin) {
                     this.screenAfterLogin = payload.screenAfterLogin;
                 }
-                this.setStateForNewView({
-                    view: Views.LOGIN,
-                });
-                this.notifyNewScreen('login');
-                ThemeController.isLogin = true;
-                this.themeWatcher.recheck();
+                this.viewLogin();
                 break;
             case 'start_password_recovery':
                 this.setStateForNewView({
@@ -973,6 +968,9 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
     }
 
     private viewWelcome() {
+        if (shouldUseLoginForWelcome(SdkConfig.get())) {
+            return this.viewLogin();
+        }
         this.setStateForNewView({
             view: Views.WELCOME,
         });
@@ -981,6 +979,16 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         this.themeWatcher.recheck();
     }
 
+    private viewLogin(otherState?: any) {
+        this.setStateForNewView({
+            view: Views.LOGIN,
+            ...otherState,
+        });
+        this.notifyNewScreen('login');
+        ThemeController.isLogin = true;
+        this.themeWatcher.recheck();
+    }
+
     private viewHome(justRegistered = false) {
         // The home page requires the "logged in" view, so we'll set that.
         this.setStateForNewView({
@@ -1296,17 +1304,13 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
      * Called when the session is logged out
      */
     private onLoggedOut() {
-        this.notifyNewScreen('login');
-        this.setStateForNewView({
-            view: Views.LOGIN,
+        this.viewLogin({
             ready: false,
             collapseLhs: false,
             currentRoomId: null,
         });
         this.subTitleStatus = '';
         this.setPageSubtitle();
-        ThemeController.isLogin = true;
-        this.themeWatcher.recheck();
     }
 
     /**
@@ -2011,7 +2015,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                     </div>
                 );
             }
-        } else if (this.state.view === Views.WELCOME && !shouldUseLoginForWelcome(SdkConfig.get())) {
+        } else if (this.state.view === Views.WELCOME) {
             const Welcome = sdk.getComponent('auth.Welcome');
             view = <Welcome />;
         } else if (this.state.view === Views.REGISTER && SettingsStore.getValue(UIFeature.Registration)) {
@@ -2043,8 +2047,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                     {...this.getServerProperties()}
                 />
             );
-        } else if (this.state.view === Views.LOGIN
-            || (this.state.view === Views.WELCOME && shouldUseLoginForWelcome(SdkConfig.get()))) {
+        } else if (this.state.view === Views.LOGIN) {
             const showPasswordReset = SettingsStore.getValue(UIFeature.PasswordReset);
             const Login = sdk.getComponent('structures.auth.Login');
             view = (

From 9b6d9b3bf1a81926658dd8a6c59c385c85575c66 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 12 Mar 2021 15:02:39 -0700
Subject: [PATCH 289/420] years are difficult

---
 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 dab75be46e..c5620c7ba2 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -1,5 +1,5 @@
 /*
-Copyright 2015-2019-2021 The Matrix.org Foundation C.I.C.
+Copyright 2015-2021 The Matrix.org Foundation C.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 4811154f25db75bbba8ee3dfd0ba09256a81c496 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 12 Mar 2021 15:24:16 -0700
Subject: [PATCH 290/420] Remove now-unused assets and CSS from
 CompleteSecurity step

---
 .../structures/auth/_CompleteSecurity.scss    | 44 -------------------
 res/img/feather-customised/monitor.svg        |  5 ---
 res/img/feather-customised/smartphone.svg     |  4 --
 3 files changed, 53 deletions(-)
 delete mode 100644 res/img/feather-customised/monitor.svg
 delete mode 100644 res/img/feather-customised/smartphone.svg

diff --git a/res/css/structures/auth/_CompleteSecurity.scss b/res/css/structures/auth/_CompleteSecurity.scss
index f742be70e4..80e7aaada0 100644
--- a/res/css/structures/auth/_CompleteSecurity.scss
+++ b/res/css/structures/auth/_CompleteSecurity.scss
@@ -26,50 +26,6 @@ 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/img/feather-customised/monitor.svg b/res/img/feather-customised/monitor.svg
deleted file mode 100644
index 231811d5a6..0000000000
--- a/res/img/feather-customised/monitor.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<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
deleted file mode 100644
index fde78c82e2..0000000000
--- a/res/img/feather-customised/smartphone.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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 830080c23ec2dbb798ae1fbe6d7bb7ff399ce424 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Sun, 14 Mar 2021 19:34:33 +0200
Subject: [PATCH 291/420] Add details and summary to allowed HTML tags

Implements MSC2184 (https://github.com/matrix-org/matrix-doc/pull/2184)

Signed-off-by: Tulir Asokan <tulir@maunium.net>
---
 src/HtmlUtils.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/HtmlUtils.tsx b/src/HtmlUtils.tsx
index 59b596a5da..1dc342fac5 100644
--- a/src/HtmlUtils.tsx
+++ b/src/HtmlUtils.tsx
@@ -237,6 +237,7 @@ const sanitizeHtmlParams: IExtendedSanitizeOptions = {
         'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'blockquote', 'p', 'a', 'ul', 'ol', 'sup', 'sub',
         'nl', 'li', 'b', 'i', 'u', 'strong', 'em', 'strike', 'code', 'hr', 'br', 'div',
         'table', 'thead', 'caption', 'tbody', 'tr', 'th', 'td', 'pre', 'span', 'img',
+        'details', 'summary',
     ],
     allowedAttributes: {
         // custom ones first:

From f9eace1729bbe52d65378c8d66d02820d59d357a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 15 Mar 2021 11:59:46 +0000
Subject: [PATCH 292/420] Rebuild alignment of the menu buttons and
 notification badges

---
 res/css/structures/_SpacePanel.scss | 63 +++++++++++++++++++++--------
 1 file changed, 46 insertions(+), 17 deletions(-)

diff --git a/res/css/structures/_SpacePanel.scss b/res/css/structures/_SpacePanel.scss
index 4ced807f66..f489d7b8b5 100644
--- a/res/css/structures/_SpacePanel.scss
+++ b/res/css/structures/_SpacePanel.scss
@@ -62,21 +62,26 @@ $activeBorderColor: $secondary-fg-color;
     }
 
     .mx_AutoHideScrollbar {
-        padding: 16px 12px 16px 0;
+        padding: 16px 0;
     }
 
     .mx_SpaceButton_toggleCollapse {
         cursor: pointer;
     }
 
-    .mx_SpaceItem.collapsed {
-        .mx_SpaceButton {
-            .mx_NotificationBadge {
-                right: -4px;
-                top: -4px;
-            }
-        }
+    .mx_SpaceTreeLevel {
+        display: flex;
+        flex-direction: column;
+        max-width: 250px;
+        flex-grow: 1;
+    }
 
+    .mx_SpaceItem {
+        display: inline-flex;
+        flex-flow: wrap;
+    }
+
+    .mx_SpaceItem.collapsed {
         & > .mx_SpaceButton > .mx_SpaceButton_toggleCollapse {
             transform: rotate(-90deg);
         }
@@ -88,15 +93,16 @@ $activeBorderColor: $secondary-fg-color;
 
     .mx_SpaceItem:not(.hasSubSpaces) > .mx_SpaceButton {
         margin-left: $gutterSize;
+        min-width: 40px;
     }
 
     .mx_SpaceButton {
         border-radius: 8px;
-        position: relative;
         margin-bottom: 2px;
         display: flex;
         align-items: center;
-        padding: 4px;
+        padding: 4px 4px 4px 0;
+        width: 100%;
 
         &.mx_SpaceButton_active {
             &:not(.mx_SpaceButton_narrow) .mx_SpaceButton_selectionWrapper {
@@ -110,6 +116,7 @@ $activeBorderColor: $secondary-fg-color;
         }
 
         .mx_SpaceButton_selectionWrapper {
+            position: relative;
             display: flex;
             flex: 1;
             align-items: center;
@@ -117,12 +124,23 @@ $activeBorderColor: $secondary-fg-color;
             padding: 4px;
         }
 
+        &:not(.mx_SpaceButton_narrow) {
+            .mx_SpaceButton_selectionWrapper {
+                width: 100%;
+                padding-right: 16px;
+                overflow: hidden;
+            }
+        }
+
+        &.mx_SpaceButton_narrow {
+            margin-right: 10px;
+        }
+
         .mx_SpaceButton_name {
             flex: 1;
             margin-left: 8px;
             white-space: nowrap;
             display: block;
-            max-width: 150px;
             text-overflow: ellipsis;
             overflow: hidden;
             padding-right: 8px;
@@ -199,8 +217,9 @@ $activeBorderColor: $secondary-fg-color;
             height: 20px;
             margin-top: auto;
             margin-bottom: auto;
-            position: relative;
             display: none;
+            position: absolute;
+            right: 4px;
 
             &::before {
                 top: 2px;
@@ -219,9 +238,8 @@ $activeBorderColor: $secondary-fg-color;
     }
 
     .mx_SpacePanel_badgeContainer {
+        position: absolute;
         height: 16px;
-        // don't set width so that it takes no space when there is no badge to show
-        margin: auto 0; // vertically align
 
         // Create a flexbox to make aligning dot badges easier
         display: flex;
@@ -241,14 +259,25 @@ $activeBorderColor: $secondary-fg-color;
     &.collapsed {
         .mx_SpaceButton {
             .mx_SpacePanel_badgeContainer {
-                position: absolute;
-                right: 0px;
-                top: 2px;
+                right: -3px;
+                top: -3px;
+            }
+
+            &.mx_SpaceButton_active .mx_SpacePanel_badgeContainer {
+                // when we draw the selection border we move the relative bounds of our parent
+                // so update our position within the bounds of the parent to maintain position overall
+                right: -6px;
+                top: -6px;
             }
         }
     }
 
     &:not(.collapsed) {
+        .mx_SpacePanel_badgeContainer {
+            position: absolute;
+            right: 4px;
+        }
+
         .mx_SpaceButton:hover,
         .mx_SpaceButton:focus-within,
         .mx_SpaceButton_hasMenuOpen {

From 272f06d57a84c714f92ad6570a6f8d506aeccec9 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 15 Mar 2021 12:16:48 +0000
Subject: [PATCH 293/420] Fix Space Panel exploding with cyclic hierarchies

---
 .../views/spaces/SpaceTreeLevel.tsx           | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/components/views/spaces/SpaceTreeLevel.tsx b/src/components/views/spaces/SpaceTreeLevel.tsx
index 04d6c02208..83bc2296e7 100644
--- a/src/components/views/spaces/SpaceTreeLevel.tsx
+++ b/src/components/views/spaces/SpaceTreeLevel.tsx
@@ -51,6 +51,7 @@ interface IItemProps {
     isNested?: boolean;
     isPanelCollapsed?: boolean;
     onExpand?: Function;
+    parents?: Set<string>;
 }
 
 interface IItemState {
@@ -299,7 +300,8 @@ export class SpaceItem extends React.PureComponent<IItemProps, IItemState> {
         const isNarrow = this.props.isPanelCollapsed;
         const collapsed = this.state.collapsed || forceCollapsed;
 
-        const childSpaces = SpaceStore.instance.getChildSpaces(space.roomId);
+        const childSpaces = SpaceStore.instance.getChildSpaces(space.roomId)
+            .filter(s => !this.props.parents?.has(s.roomId));
         const isActive = activeSpaces.includes(space);
         const itemClasses = classNames({
             "mx_SpaceItem": true,
@@ -312,11 +314,17 @@ export class SpaceItem extends React.PureComponent<IItemProps, IItemState> {
             mx_SpaceButton_narrow: isNarrow,
         });
         const notificationState = SpaceStore.instance.getNotificationState(space.roomId);
-        const childItems = childSpaces && !collapsed ? <SpaceTreeLevel
-            spaces={childSpaces}
-            activeSpaces={activeSpaces}
-            isNested={true}
-        /> : null;
+
+        let childItems;
+        if (childSpaces && !collapsed) {
+            childItems = <SpaceTreeLevel
+                spaces={childSpaces}
+                activeSpaces={activeSpaces}
+                isNested={true}
+                parents={new Set(this.props.parents).add(this.props.space.roomId)}
+            />;
+        }
+
         let notifBadge;
         if (notificationState) {
             notifBadge = <div className="mx_SpacePanel_badgeContainer">
@@ -383,12 +391,14 @@ interface ITreeLevelProps {
     spaces: Room[];
     activeSpaces: Room[];
     isNested?: boolean;
+    parents: Set<string>;
 }
 
 const SpaceTreeLevel: React.FC<ITreeLevelProps> = ({
     spaces,
     activeSpaces,
     isNested,
+    parents,
 }) => {
     return <ul className="mx_SpaceTreeLevel">
         {spaces.map(s => {
@@ -397,6 +407,7 @@ const SpaceTreeLevel: React.FC<ITreeLevelProps> = ({
                 activeSpaces={activeSpaces}
                 space={s}
                 isNested={isNested}
+                parents={parents}
             />);
         })}
     </ul>;

From 62983ca48efd4ec4087a5d29cce3b11acce6d34a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 15 Mar 2021 12:57:35 +0000
Subject: [PATCH 294/420] Fix space panel alignments when no scrollbar is
 present

---
 res/css/structures/_SpacePanel.scss         | 5 +----
 res/css/structures/_SpaceRoomDirectory.scss | 1 +
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/res/css/structures/_SpacePanel.scss b/res/css/structures/_SpacePanel.scss
index f489d7b8b5..afcf48ec4d 100644
--- a/res/css/structures/_SpacePanel.scss
+++ b/res/css/structures/_SpacePanel.scss
@@ -35,6 +35,7 @@ $activeBorderColor: $secondary-fg-color;
 
     .mx_SpacePanel_spaceTreeWrapper {
         flex: 1;
+        overflow-y: scroll;
     }
 
     .mx_SpacePanel_toggleCollapse {
@@ -132,10 +133,6 @@ $activeBorderColor: $secondary-fg-color;
             }
         }
 
-        &.mx_SpaceButton_narrow {
-            margin-right: 10px;
-        }
-
         .mx_SpaceButton_name {
             flex: 1;
             margin-left: 8px;
diff --git a/res/css/structures/_SpaceRoomDirectory.scss b/res/css/structures/_SpaceRoomDirectory.scss
index c96398594f..b14e92a1af 100644
--- a/res/css/structures/_SpaceRoomDirectory.scss
+++ b/res/css/structures/_SpaceRoomDirectory.scss
@@ -132,6 +132,7 @@ limitations under the License.
                 height: min-content;
                 margin-left: auto;
                 margin-right: 16px;
+                display: inline-flex;
             }
         }
 

From da627dab20656757fa46d5a95fe8717571852011 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 15 Mar 2021 14:38:57 +0000
Subject: [PATCH 295/420] Upgrade matrix-js-sdk to 9.9.0

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

diff --git a/package.json b/package.json
index ddc352104c..7324d5b352 100644
--- a/package.json
+++ b/package.json
@@ -80,7 +80,7 @@
     "katex": "^0.12.0",
     "linkifyjs": "^2.1.9",
     "lodash": "^4.17.20",
-    "matrix-js-sdk": "9.9.0-rc.1",
+    "matrix-js-sdk": "9.9.0",
     "matrix-widget-api": "^0.1.0-beta.13",
     "minimist": "^1.2.5",
     "pako": "^2.0.3",
diff --git a/yarn.lock b/yarn.lock
index 5c78e70590..aaee47b876 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5572,10 +5572,10 @@ mathml-tag-names@^2.1.3:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
   integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
 
-matrix-js-sdk@9.9.0-rc.1:
-  version "9.9.0-rc.1"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.9.0-rc.1.tgz#5ee28aee89a87ccdf742d1512bc44ec54454e94f"
-  integrity sha512-A3pY5CyCNE5+QdpYL/C7FGU8KjBojXRWbtWsbeTMFwZEuzkIYlCtev1i07NbN3kbF83R3TtOfSCxQITm1C5jwg==
+matrix-js-sdk@9.9.0:
+  version "9.9.0"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.9.0.tgz#30c46419c026fcad0ff25aea9417b77921f64c6d"
+  integrity sha512-rgy9b8D+GzjK3wfdmxDr42fxNV13fK12cvQD1qnsFzqPyJGeg++cazH/+7HxL/uuW/WQR6HAmfc7wo9VQegWtg==
   dependencies:
     "@babel/runtime" "^7.12.5"
     another-json "^0.2.0"

From 2ef9f3327e1c2635a8c9cb4e8df8a48521ac3e4b Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 15 Mar 2021 14:45:35 +0000
Subject: [PATCH 296/420] Prepare changelog for v3.16.0

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0b130d1c70..ea4b015ee9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+Changes in [3.16.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.16.0) (2021-03-15)
+=====================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.16.0-rc.2...v3.16.0)
+
+ * [Release] Change read receipt drift to be non-fractional
+   [\#5746](https://github.com/matrix-org/matrix-react-sdk/pull/5746)
+ * [Release] Properly gate SpaceRoomView behind labs
+   [\#5750](https://github.com/matrix-org/matrix-react-sdk/pull/5750)
+
 Changes in [3.16.0-rc.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.16.0-rc.2) (2021-03-10)
 ===============================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.16.0-rc.1...v3.16.0-rc.2)

From 44fd41cb1e769038914025c836c8d241ad2b4be6 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 15 Mar 2021 14:45:36 +0000
Subject: [PATCH 297/420] v3.16.0

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

diff --git a/package.json b/package.json
index 7324d5b352..5bbb2a0a15 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "3.16.0-rc.2",
+  "version": "3.16.0",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From 1d1263c39a6b261bb5c6fde9a244377e16b4a1e5 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 15 Mar 2021 14:46:57 +0000
Subject: [PATCH 298/420] Resetting package fields for development

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

diff --git a/package.json b/package.json
index 2841e01824..ab450f0526 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
     "matrix-gen-i18n": "scripts/gen-i18n.js",
     "matrix-prune-i18n": "scripts/prune-i18n.js"
   },
-  "main": "./lib/index.js",
+  "main": "./src/index.js",
   "matrix_src_main": "./src/index.js",
   "matrix_lib_main": "./lib/index.js",
   "matrix_lib_typings": "./lib/index.d.ts",
@@ -190,6 +190,5 @@
     "transformIgnorePatterns": [
       "/node_modules/(?!matrix-js-sdk).+$"
     ]
-  },
-  "typings": "./lib/index.d.ts"
+  }
 }

From a696c09e1ec11c43312360def847e582971d9014 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 15 Mar 2021 14:47:08 +0000
Subject: [PATCH 299/420] 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 ab450f0526..f8b4287197 100644
--- a/package.json
+++ b/package.json
@@ -80,7 +80,7 @@
     "katex": "^0.12.0",
     "linkifyjs": "^2.1.9",
     "lodash": "^4.17.20",
-    "matrix-js-sdk": "9.9.0",
+    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
     "matrix-widget-api": "^0.1.0-beta.13",
     "minimist": "^1.2.5",
     "pako": "^2.0.3",
diff --git a/yarn.lock b/yarn.lock
index 275c315921..58686248f7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5587,10 +5587,9 @@ mathml-tag-names@^2.1.3:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
   integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
 
-matrix-js-sdk@9.9.0:
+"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
   version "9.9.0"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.9.0.tgz#30c46419c026fcad0ff25aea9417b77921f64c6d"
-  integrity sha512-rgy9b8D+GzjK3wfdmxDr42fxNV13fK12cvQD1qnsFzqPyJGeg++cazH/+7HxL/uuW/WQR6HAmfc7wo9VQegWtg==
+  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/cd38fb9b4c349eb31feac14e806e710bf6431b72"
   dependencies:
     "@babel/runtime" "^7.12.5"
     another-json "^0.2.0"

From 3154dd6cd441b7710a525e75512e1665adf60746 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 15 Mar 2021 14:48:40 +0000
Subject: [PATCH 300/420] Add SDK version to changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ea4b015ee9..38b1a2572f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@ Changes in [3.16.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/
 =====================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.16.0-rc.2...v3.16.0)
 
+ * Upgrade to JS SDK 9.9.0
  * [Release] Change read receipt drift to be non-fractional
    [\#5746](https://github.com/matrix-org/matrix-react-sdk/pull/5746)
  * [Release] Properly gate SpaceRoomView behind labs

From f575625c7a5a5ec8984ae40aa5a97b3436249260 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20K=C3=B6sters?= <timo@koesters.xyz>
Date: Mon, 15 Mar 2021 23:13:16 +0100
Subject: [PATCH 301/420] fix: make room directory correct when using a
 homeserver with explicit port

Server names are allowed to contain ':' to specify a port, see https://matrix.org/docs/spec/appendices#server-name
User ids on the other hand are not allowed to contain ':', even
historical user ids, see https://matrix.org/docs/spec/appendices#historical-user-ids

Therefore we can use change the regex to make sure the localpart is not
allowed to contain ':'.
---
 src/MatrixClientPeg.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/MatrixClientPeg.ts b/src/MatrixClientPeg.ts
index 98ca446532..de1d573d40 100644
--- a/src/MatrixClientPeg.ts
+++ b/src/MatrixClientPeg.ts
@@ -261,7 +261,7 @@ class _MatrixClientPeg implements IMatrixClientPeg {
     }
 
     public getHomeserverName(): string {
-        const matches = /^@.+:(.+)$/.exec(this.matrixClient.credentials.userId);
+        const matches = /^@[^:]+:(.+)$/.exec(this.matrixClient.credentials.userId);
         if (matches === null || matches.length < 1) {
             throw new Error("Failed to derive homeserver name from user ID!");
         }

From baaceccfdaeae98bd08cf477356aea6ceed0b12e Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 16 Mar 2021 10:53:27 +0000
Subject: [PATCH 302/420] Rearrange dom hierarchy to put space panel at same
 level as LeftPanel

so they don't steal horizontal space from each other
---
 res/css/structures/_LeftPanel.scss         |  2 +-
 res/css/structures/_MatrixChat.scss        |  2 +-
 src/components/structures/LeftPanel.tsx    |  7 +------
 src/components/structures/LoggedInView.tsx | 23 +++++++---------------
 4 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/res/css/structures/_LeftPanel.scss b/res/css/structures/_LeftPanel.scss
index f1f27014ee..c4bbdefb44 100644
--- a/res/css/structures/_LeftPanel.scss
+++ b/res/css/structures/_LeftPanel.scss
@@ -19,7 +19,7 @@ $roomListCollapsedWidth: 68px;
 
 .mx_LeftPanel {
     background-color: $roomlist-bg-color;
-    min-width: 260px;
+    min-width: 200px;
     max-width: 50%;
 
     // Create a row-based flexbox for the GroupFilterPanel and the room list
diff --git a/res/css/structures/_MatrixChat.scss b/res/css/structures/_MatrixChat.scss
index 812a7f8472..a220c5d505 100644
--- a/res/css/structures/_MatrixChat.scss
+++ b/res/css/structures/_MatrixChat.scss
@@ -66,7 +66,7 @@ limitations under the License.
 }
 
 /* not the left panel, and not the resize handle, so the roomview/groupview/... */
-.mx_MatrixChat > :not(.mx_LeftPanel):not(.mx_ResizeHandle) {
+.mx_MatrixChat > :not(.mx_LeftPanel):not(.mx_SpacePanel):not(.mx_ResizeHandle) {
     background-color: $primary-bg-color;
 
     flex: 1 1 0;
diff --git a/src/components/structures/LeftPanel.tsx b/src/components/structures/LeftPanel.tsx
index 82dd9443cc..077dbbb29c 100644
--- a/src/components/structures/LeftPanel.tsx
+++ b/src/components/structures/LeftPanel.tsx
@@ -39,7 +39,6 @@ import { OwnProfileStore } from "../../stores/OwnProfileStore";
 import { MatrixClientPeg } from "../../MatrixClientPeg";
 import RoomListNumResults from "../views/rooms/RoomListNumResults";
 import LeftPanelWidget from "./LeftPanelWidget";
-import SpacePanel from "../views/spaces/SpacePanel";
 
 interface IProps {
     isMinimized: boolean;
@@ -390,11 +389,7 @@ export default class LeftPanel extends React.Component<IProps, IState> {
 
     public render(): React.ReactNode {
         let leftLeftPanel;
-        // Currently TagPanel.enableTagPanel is disabled when Legacy Communities are disabled so for now
-        // ignore it and force the rendering of SpacePanel if that Labs flag is enabled.
-        if (SettingsStore.getValue("feature_spaces")) {
-            leftLeftPanel = <SpacePanel />;
-        } else if (this.state.showGroupFilterPanel) {
+        if (this.state.showGroupFilterPanel) {
             leftLeftPanel = (
                 <div className="mx_LeftPanel_GroupFilterPanelContainer">
                     <GroupFilterPanel />
diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx
index 3e6d56fd54..b7212ddb25 100644
--- a/src/components/structures/LoggedInView.tsx
+++ b/src/components/structures/LoggedInView.tsx
@@ -56,6 +56,7 @@ import Modal from "../../Modal";
 import { ICollapseConfig } from "../../resizer/distributors/collapse";
 import HostSignupContainer from '../views/host_signup/HostSignupContainer';
 import { IOpts } from "../../createRoom";
+import SpacePanel from "../views/spaces/SpacePanel";
 
 // 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.
@@ -227,14 +228,7 @@ class LoggedInView extends React.Component<IProps, IState> {
         let size;
         let collapsed;
         const collapseConfig: ICollapseConfig = {
-            // TODO: the space panel currently does not have a fixed width,
-            // just the headers at each level have a max-width of 150px
-            // Taking 222px for the space panel for now,
-            // so this will look slightly off for now,
-            // depending on the depth of your space tree.
-            // To fix this, we'll need to turn toggleSize
-            // into a callback so it can be measured when starting the resize operation
-            toggleSize: 222 + 68,
+            toggleSize: 200,
             onCollapsed: (_collapsed) => {
                 collapsed = _collapsed;
                 if (_collapsed) {
@@ -668,13 +662,6 @@ class LoggedInView extends React.Component<IProps, IState> {
             bodyClasses += ' mx_MatrixChat_useCompactLayout';
         }
 
-        const leftPanel = (
-            <LeftPanel
-                isMinimized={this.props.collapseLhs || false}
-                resizeNotifier={this.props.resizeNotifier}
-            />
-        );
-
         return (
             <MatrixClientContext.Provider value={this._matrixClient}>
                 <div
@@ -686,7 +673,11 @@ class LoggedInView extends React.Component<IProps, IState> {
                     <ToastContainer />
                     <DragDropContext onDragEnd={this._onDragEnd}>
                         <div ref={this._resizeContainer} className={bodyClasses}>
-                            { leftPanel }
+                            { SettingsStore.getValue("feature_spaces") ? <SpacePanel /> : null }
+                            <LeftPanel
+                                isMinimized={this.props.collapseLhs || false}
+                                resizeNotifier={this.props.resizeNotifier}
+                            />
                             <ResizeHandle />
                             { pageElement }
                         </div>

From 11cd791c7606ecafa2af93826d69b36cc48c1d27 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 16 Mar 2021 11:11:44 +0000
Subject: [PATCH 303/420] Tweak left panel min widths for better flexibility

---
 res/css/structures/_LeftPanel.scss         | 3 ++-
 src/components/structures/LoggedInView.tsx | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/res/css/structures/_LeftPanel.scss b/res/css/structures/_LeftPanel.scss
index c4bbdefb44..10357117da 100644
--- a/res/css/structures/_LeftPanel.scss
+++ b/res/css/structures/_LeftPanel.scss
@@ -19,7 +19,8 @@ $roomListCollapsedWidth: 68px;
 
 .mx_LeftPanel {
     background-color: $roomlist-bg-color;
-    min-width: 200px;
+    // TODO decrease this once Spaces launches as it'll no longer need to include the 56px Community Panel
+    min-width: 206px;
     max-width: 50%;
 
     // Create a row-based flexbox for the GroupFilterPanel and the room list
diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx
index b7212ddb25..3c7e79b89d 100644
--- a/src/components/structures/LoggedInView.tsx
+++ b/src/components/structures/LoggedInView.tsx
@@ -228,7 +228,8 @@ class LoggedInView extends React.Component<IProps, IState> {
         let size;
         let collapsed;
         const collapseConfig: ICollapseConfig = {
-            toggleSize: 200,
+            // TODO decrease this once Spaces launches as it'll no longer need to include the 56px Community Panel
+            toggleSize: 206 - 50,
             onCollapsed: (_collapsed) => {
                 collapsed = _collapsed;
                 if (_collapsed) {

From 8008b6023d69a21ca338b3b502afb6a76d9266be Mon Sep 17 00:00:00 2001
From: libexus <Asterixeins324@gmail.com>
Date: Tue, 16 Mar 2021 10:12:51 +0000
Subject: [PATCH 304/420] Translated using Weblate (German)

Currently translated at 96.7% (2795 of 2889 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
---
 src/i18n/strings/de_DE.json | 130 ++++++++++++++++++------------------
 1 file changed, 66 insertions(+), 64 deletions(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 1780708e55..0981cf3f3d 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -60,7 +60,7 @@
     "Notifications": "Benachrichtigungen",
     "<not supported>": "<nicht unterstützt>",
     "No users have specific privileges in this room": "Keine Nutzer:innen haben in diesem Raum privilegierte Berechtigungen",
-    "Only people who have been invited": "Nur Personen, die eingeladen wurden",
+    "Only people who have been invited": "Eingeladene Personen",
     "Password": "Passwort",
     "Permissions": "Berechtigungen",
     "Phone": "Telefon",
@@ -95,7 +95,7 @@
     "Voice call": "Sprachanruf",
     "VoIP conference finished.": "VoIP-Konferenz wurde beendet.",
     "VoIP conference started.": "VoIP-Konferenz gestartet.",
-    "Who can access this room?": "Wer hat Zugang zu diesem Raum?",
+    "Who can access this room?": "Wer kann diesen Raum betreten?",
     "Who can read history?": "Wer kann den bisherigen Chatverlauf lesen?",
     "You do not have permission to post to this room": "Du hast keine Berechtigung, in diesem Raum etwas zu senden",
     "Call Timeout": "Anruf-Timeout",
@@ -103,7 +103,7 @@
     "Failed to verify email address: make sure you clicked the link in the email": "Verifizierung der E-Mail-Adresse fehlgeschlagen: Bitte stelle sicher, dass du den Link in der E-Mail angeklickt hast",
     "Failure to create room": "Raumerstellung fehlgeschlagen",
     "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s hat keine Berechtigung, um Benachrichtigungen zu senden - bitte Browser-Einstellungen überprüfen",
-    "%(brand)s was not given permission to send notifications - please try again": "%(brand)s hat keine Berechtigung für das Senden von Benachrichtigungen erhalten - bitte erneut versuchen",
+    "%(brand)s was not given permission to send notifications - please try again": "%(brand)s hat keine Berechtigung für das Senden von Benachrichtigungen erhalten - Bitte versuche es erneut",
     "This email address is already in use": "Diese E-Mail-Adresse wird bereits verwendet",
     "This email address was not found": "Diese E-Mail-Adresse konnte nicht gefunden werden",
     "The remote side failed to pick up": "Die Gegenstelle konnte nicht abheben",
@@ -159,7 +159,7 @@
     "%(targetName)s left the room.": "%(targetName)s hat den Raum verlassen.",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s hat den zukünftigen Chatverlauf für alle Raum-Mitglieder sichtbar gemacht (ab dem Zeitpunkt, an dem sie eingeladen wurden).",
     "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s hat den zukünftigen Chatverlauf für alle Raum-Mitglieder sichtbar gemacht (ab dem Zeitpunkt, an dem sie beigetreten sind).",
-    "%(senderName)s made future room history visible to all room members.": "%(senderName)s hat den zukünftigen Chatverlauf sichtbar gemacht für: Alle Raum-Mitglieder.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s hat den zukünftigen Chatverlauf für alle Raummitglieder sichtbar gemacht.",
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s hat den zukünftigen Chatverlauf für alle sichtbar gemacht.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s hat den zukünftigen Chatverlauf für Unbekannte sichtbar gemacht (%(visibility)s).",
     "Missing room_id in request": "Fehlende room_id in Anfrage",
@@ -177,7 +177,7 @@
     "%(senderName)s set a profile picture.": "%(senderName)s hat ein Profilbild gesetzt.",
     "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s hat den Anzeigenamen geändert in %(displayName)s.",
     "This room is not recognised.": "Dieser Raum wurde nicht erkannt.",
-    "To use it, just wait for autocomplete results to load and tab through them.": "Um diese Funktion zu nutzen, warte einfach auf die Ergebnisse der Autovervollständigung und benutze dann die TAB-Taste zum Durchblättern.",
+    "To use it, just wait for autocomplete results to load and tab through them.": "Um diese Funktion zu nutzen, warte auf die Ergebnisse der Autovervollständigung und benutze dann die TAB-Taste zum Durchblättern.",
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s hat die Verbannung von %(targetName)s aufgehoben.",
     "Usage": "Verwendung",
     "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s hat die Einladung für %(targetName)s zurückgezogen.",
@@ -185,7 +185,7 @@
     "You need to be logged in.": "Du musst angemeldet sein.",
     "There are no visible files in this room": "Es gibt keine sichtbaren Dateien in diesem Raum",
     "Connectivity to the server has been lost.": "Verbindung zum Server wurde unterbrochen.",
-    "Sent messages will be stored until your connection has returned.": "Gesendete Nachrichten werden gespeichert, bis die Internetverbindung wiederhergestellt wird.",
+    "Sent messages will be stored until your connection has returned.": "Nachrichten werden gespeichert und gesendet, wenn die Internetverbindung wiederhergestellt ist.",
     "Active call": "Aktiver Anruf",
     "click to reveal": "anzeigen",
     "Failed to forget room %(errCode)s": "Das Entfernen des Raums ist fehlgeschlagen %(errCode)s",
@@ -390,7 +390,7 @@
     "Add a widget": "Widget hinzufügen",
     "Allow": "Erlauben",
     "Delete widget": "Widget entfernen",
-    "Define the power level of a user": "Berechtigungsstufe einer/s Benutzer!n setzen",
+    "Define the power level of a user": "Berechtigungsstufe einer/s Benutzer:in setzen",
     "Edit": "Bearbeiten",
     "Enable automatic language detection for syntax highlighting": "Automatische Spracherkennung für die Syntax-Hervorhebung aktivieren",
     "To get started, please pick a username!": "Um zu starten, wähle bitte einen Nutzernamen!",
@@ -425,7 +425,7 @@
     "Unignore": "Nicht mehr ignorieren",
     "Unignored user": "Benutzer:in nicht mehr ignoriert",
     "Ignored user": "Benutzer:in ignoriert",
-    "Stops ignoring a user, showing their messages going forward": "Beendet das Ignorieren eines Benutzers, nachfolgende Nachrichten werden wieder angezeigt",
+    "Stops ignoring a user, showing their messages going forward": "Benutzer:in nicht mehr ignorieren und neue Nachrichten wieder anzeigen",
     "Ignores a user, hiding their messages from you": "Ignoriert eine:n Benutzer:in und verbirgt dessen/deren Nachrichten",
     "Banned by %(displayName)s": "Verbannt von %(displayName)s",
     "Description": "Beschreibung",
@@ -504,7 +504,7 @@
     "Delete Widget": "Widget löschen",
     "Mention": "Erwähnen",
     "Invite": "Einladen",
-    "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Das Löschen eines Widgets entfernt es für alle Nutzer:innen in diesem Raum. Möchtest du dieses Widget wirklich löschen?",
+    "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Das Löschen eines Widgets entfernt es für alle Nutzer:innen in diesem Raum. Möchtest du es wirklich löschen?",
     "Mirror local video feed": "Lokalen Video-Feed spiegeln",
     "Failed to withdraw invitation": "Die Einladung konnte nicht zurückgezogen werden",
     "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Community-IDs dürfen nur die folgenden Zeichen enthalten: a-z, 0-9, or '=_-./'",
@@ -575,7 +575,7 @@
     "%(items)s and %(count)s others|one": "%(items)s und ein weiteres Raummitglied",
     "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Eine E-Mail wurde an %(emailAddress)s gesendet. Folge dem in der E-Mail enthaltenen Link und klicke dann unten.",
     "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "Die Sichtbarkeit von '%(roomName)s' in %(groupId)s konnte nicht aktualisiert werden.",
-    "Visibility in Room List": "Sichtbarkeit in Raum-Liste",
+    "Visibility in Room List": "Sichtbarkeit in Raumliste",
     "Visible to everyone": "Für alle sichtbar",
     "Only visible to community members": "Nur für Community-Mitglieder sichtbar",
     "Community Invites": "Community-Einladungen",
@@ -588,7 +588,7 @@
     "Enable inline URL previews by default": "URL-Vorschau standardmäßig aktivieren",
     "Enable URL previews for this room (only affects you)": "URL-Vorschau für diesen Raum aktivieren (betrifft nur dich)",
     "Enable URL previews by default for participants in this room": "URL-Vorschau standardmäßig für Mitglieder dieses Raumes aktivieren",
-    "Please note you are logging into the %(hs)s server, not matrix.org.": "Hinweis: Du bist im Begriff, dich auf dem %(hs)s-Server anzumelden, nicht auf matrix.org.",
+    "Please note you are logging into the %(hs)s server, not matrix.org.": "Du meldest dich gerade am %(hs)s-Server an, nicht auf matrix.org.",
     "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Sonst ist hier aktuell niemand. Möchtest du <inviteText>Benutzer einladen</inviteText> oder die <nowarnText>Warnmeldung bezüglich des leeren Raums deaktivieren</nowarnText>?",
     "URL previews are disabled by default for participants in this room.": "URL-Vorschau ist für Mitglieder dieses Raumes standardmäßig deaktiviert.",
     "URL previews are enabled by default for participants in this room.": "URL-Vorschau ist für Mitglieder dieses Raumes standardmäßig aktiviert.",
@@ -754,7 +754,7 @@
     "Logs sent": "Logs gesendet",
     "Back": "Zurück",
     "Reply": "Antworten",
-    "Show message in desktop notification": "Nachricht in der Desktop-Benachrichtigung anzeigen",
+    "Show message in desktop notification": "Nachrichteninhalt in der Desktopbenachrichtigung anzeigen",
     "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.": "Fehlerberichte enthalten Anwendungsdaten wie deinen Nutzernamen, Raum- und Gruppen-ID's und Aliase die du besucht hast sowie Nutzernamen anderer Nutzer. Sie enthalten keine Nachrichten.",
     "Unhide Preview": "Vorschau wieder anzeigen",
     "Unable to join network": "Es ist nicht möglich, dem Netzwerk beizutreten",
@@ -809,7 +809,7 @@
     "Terms and Conditions": "Geschäftsbedingungen",
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Um den %(homeserverDomain)s -Heimserver weiter zu verwenden, musst du die Geschäftsbedingungen sichten und ihnen zustimmen.",
     "Review terms and conditions": "Geschäftsbedingungen anzeigen",
-    "Share Link to User": "Link zum/r Benutzer:in teilen",
+    "Share Link to User": "Link zu Benutzer:in teilen",
     "Share room": "Raum teilen",
     "Share Room": "Raum teilen",
     "Link to most recent message": "Link zur aktuellsten Nachricht",
@@ -834,7 +834,7 @@
     "This event could not be displayed": "Dieses Ereignis konnte nicht angezeigt werden",
     "A call is currently being placed!": "Ein Anruf wurde schon gestartet!",
     "Permission Required": "Berechtigung benötigt",
-    "You do not have permission to start a conference call in this room": "Du hast keine Berechtigung ein Konferenzgespräch in diesem Raum zu starten",
+    "You do not have permission to start a conference call in this room": "Du hast keine Berechtigung, ein Konferenzgespräch in diesem Raum zu starten",
     "Failed to remove widget": "Widget konnte nicht entfernt werden",
     "An error ocurred whilst trying to remove the widget from the room": "Ein Fehler trat auf während versucht wurde, das Widget aus diesem Raum zu entfernen",
     "System Alerts": "System-Benachrichtigung",
@@ -862,7 +862,7 @@
     "Upgrade this room to version %(version)s": "Diesen Raum zur Version %(version)s aufrüsten",
     "Forces the current outbound group session in an encrypted room to be discarded": "Erzwingt, dass die aktuell ausgehende Gruppen-Sitzung in einem verschlüsseltem Raum verworfen wird",
     "Unable to connect to Homeserver. Retrying...": "Verbindung mit Heimserver nicht möglich. Versuche erneut...",
-    "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s setzte die Hauptadresse zu diesem Raum auf %(address)s.",
+    "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s hat die Hauptadresse zu diesem Raum auf %(address)s gesetzt.",
     "%(senderName)s removed the main address for this room.": "%(senderName)s entfernte die Hauptadresse von diesem Raum.",
     "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Bevor du Log-Dateien übermittelst, musst du ein <a>GitHub-Issue erstellen</a> um dein Problem zu beschreiben.",
     "%(brand)s now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!": "%(brand)s benutzt nun 3 - 5-mal weniger Arbeitsspeicher, indem Informationen über andere Nutzer:innen erst bei Bedarf geladen werden. Bitte warte, während die Daten erneut mit dem Server abgeglichen werden!",
@@ -897,8 +897,8 @@
     "No backup found!": "Keine Schlüsselsicherung gefunden!",
     "This looks like a valid recovery key!": "Dies sieht wie ein gültiger Wiederherstellungsschlüssel aus!",
     "Not a valid recovery key": "Kein valider Wiederherstellungsschlüssel",
-    "There was an error joining the room": "Es gab einen Fehler beim Raum-Beitreten",
-    "Use a few words, avoid common phrases": "Benutze einige Worte, vermeide gängige Phrasen",
+    "There was an error joining the room": "Fehler beim Betreten des Raumes",
+    "Use a few words, avoid common phrases": "Benutze einige Worte und vermeide gängige Phrasen",
     "No need for symbols, digits, or uppercase letters": "Kein Bedarf an Symbolen, Zahlen oder Großbuchstaben",
     "Avoid repeated words and characters": "Vermeide wiederholte Worte und Zeichen",
     "Avoid sequences": "Vermeide Sätze",
@@ -911,18 +911,18 @@
     "Predictable substitutions like '@' instead of 'a' don't help very much": "Vorhersagbare Ersetzungen wie '@' anstelle von 'a' helfen nicht viel",
     "Add another word or two. Uncommon words are better.": "Füge ein weiteres Wort - oder mehr - hinzu. Ungewöhnliche Worte sind besser.",
     "Repeats like \"aaa\" are easy to guess": "Wiederholungen wie \"aaa\" sind einfach zu erraten",
-    "Repeats like \"abcabcabc\" are only slightly harder to guess than \"abc\"": "Wiederholungen wie \"abcabcabc\" sind nur leicht schwerer zu raten als \"abc\"",
+    "Repeats like \"abcabcabc\" are only slightly harder to guess than \"abc\"": "Wiederholungen wie \"abcabcabc\" sind fast so schnell zu erraten wie \"abc\"",
     "Sequences like abc or 6543 are easy to guess": "Sequenzen wie \"abc\" oder \"6543\" sind leicht zu raten",
     "Recent years are easy to guess": "Kürzlich vergangene Jahre sind einfach zu raten",
-    "Dates are often easy to guess": "Daten sind oft einfach zu erraten",
-    "This is a top-10 common password": "Dies ist unter den Top 10 der üblichen Passwörter",
+    "Dates are often easy to guess": "Ein Datum ist leicht zu erraten",
+    "This is a top-10 common password": "Dies ist unter den Top 10 der häufigsten Passwörter",
     "This is a top-100 common password": "Dies ist unter den Top 100 der üblichen Passwörter",
     "This is a very common password": "Dies ist ein recht bekanntes Passwort",
     "This is similar to a commonly used password": "Dies ist ähnlich zu einem oft genutzten Passwort",
     "A word by itself is easy to guess": "Ein Wort alleine ist einfach zu erraten",
     "Names and surnames by themselves are easy to guess": "Namen und Familiennamen alleine sind einfach zu erraten",
     "Common names and surnames are easy to guess": "Häufige Namen und Familiennamen sind einfach zu erraten",
-    "You do not have permission to invite people to this room.": "Du hast keine Berechtigung um Personen in diesen Raum einzuladen.",
+    "You do not have permission to invite people to this room.": "Du kannst keine Personen in diesen Raum einladen.",
     "User %(user_id)s does not exist": "Benutzer:in %(user_id)s existiert nicht",
     "Unknown server error": "Unbekannter Serverfehler",
     "Failed to invite users to the room:": "Konnte Benutzer nicht in den Raum einladen:",
@@ -962,7 +962,7 @@
     "Go to Settings": "Gehe zu Einstellungen",
     "Sign in with single sign-on": "Melde dich mit „Single Sign-On“ an",
     "Unrecognised address": "Nicht erkannte Adresse",
-    "User %(user_id)s may or may not exist": "Existenz des/der Benutzers/in %(user_id)s unsicher",
+    "User %(user_id)s may or may not exist": "Unklar, ob Benutzer:in %(user_id)s existiert",
     "Prompt before sending invites to potentially invalid matrix IDs": "Nachfragen, bevor Einladungen zu möglichen ungültigen Matrix-IDs gesendet werden",
     "The following users may not exist": "Eventuell existieren folgende Benutzer:innen nicht",
     "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "Profile für die unteren Matrix IDs wurden nicht gefunden - willst Du sie trotzdem einladen?",
@@ -979,7 +979,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)": "Betreten-/Verlassen-Nachrichten zeigen (betrifft nicht Einladungen/Kicks/Bans)",
+    "Show join/leave messages (invites/kicks/bans unaffected)": "Nachrichten beim Betreten oder Verlassen von Benutzern anzeigen (betrifft nicht Einladungen/Kicks/Bans)",
     "Show avatar changes": "Avatar-Änderungen anzeigen",
     "Show display name changes": "Anzeigenamen-Änderungen anzeigen",
     "Send typing notifications": "Tipp-Benachrichtigungen senden",
@@ -1018,8 +1018,8 @@
     "Theme": "Design",
     "Account management": "Benutzerkontenverwaltung",
     "For help with using %(brand)s, click <a>here</a>.": "Um Hilfe zur Benutzung von %(brand)s zu erhalten, klicke <a>hier</a>.",
-    "For help with using %(brand)s, click <a>here</a> or start a chat with our bot using the button below.": "Um Hilfe zur Benutzung von %(brand)s zu erhalten, klicke <a>hier</a> oder beginne einen Chat mit unserem Bot, indem du den unteren Button klickst.",
-    "Chat with %(brand)s Bot": "Chatte mit dem %(brand)s Bot",
+    "For help with using %(brand)s, click <a>here</a> or start a chat with our bot using the button below.": "Um Hilfe zur Benutzung von %(brand)s zu erhalten, klicke <a>hier</a> oder beginne einen Chat mit unserem Bot. Klicke dazu auf den unteren Knopf.",
+    "Chat with %(brand)s Bot": "Chatte mit dem %(brand)s-Bot",
     "Help & About": "Hilfe & Über",
     "Bug reporting": "Fehler melden",
     "FAQ": "Häufige Fragen",
@@ -1030,9 +1030,9 @@
     "Room list": "Raumliste",
     "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Die Datei '%(fileName)s' überschreitet die maximale Größe für Uploads auf diesem Heimserver",
     "This room has no topic.": "Dieser Raum hat kein Thema.",
-    "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s machte den Raum für jeden, der den Link kennt öffentlich.",
+    "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s hat den Raum für jeden, der den Link kennt, öffentlich gemacht.",
     "%(senderDisplayName)s made the room invite only.": "%(senderDisplayName)s hat den Raum auf eingeladene Benutzer beschränkt.",
-    "%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s änderte die Zutrittsregel auf '%(rule)s'",
+    "%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s hat die Zutrittsregel auf '%(rule)s' geändert",
     "%(senderDisplayName)s has allowed guests to join the room.": "%(senderDisplayName)s erlaubte Gäste diesem Raum beizutreten.",
     "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)s hat Gästen verboten, diesem Raum beizutreten.",
     "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s änderte den Gastzugriff auf '%(rule)s'",
@@ -1103,14 +1103,14 @@
     "Timeline": "Chatverlauf",
     "Autocomplete delay (ms)": "Verzögerung zur Autovervollständigung (ms)",
     "Roles & Permissions": "Rollen & Berechtigungen",
-    "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Änderungen daran, wer den Chatverlauf lesen kann werden nur zukünftige Nachrichten in diesem Raum angewendet. Die Sichtbarkeit des existierenden Verlaufs bleibt unverändert.",
+    "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Änderungen an der Sichtbarkeit des Chatverlaufs gelten nur für zukünftige Nachrichten. Die Sichtbarkeit des existierenden Verlaufs bleibt unverändert.",
     "Security & Privacy": "Sicherheit & Datenschutz",
     "Encryption": "Verschlüsselung",
     "Once enabled, encryption cannot be disabled.": "Sobald aktiviert, kann die Verschlüsselung nicht mehr deaktiviert werden.",
     "Encrypted": "Verschlüsselt",
     "Ignored users": "Ignorierte Benutzer",
     "Key backup": "Schlüsselsicherung",
-    "Gets or sets the room topic": "Frage das Thema des Raums ab oder setze es",
+    "Gets or sets the room topic": "Raumthema anzeigen oder ändern",
     "Verify this user by confirming the following emoji appear on their screen.": "Verifiziere diese Nutzer:in, indem du bestätigst, dass folgende Emojis auf dessen Bildschirm erscheinen.",
     "Missing media permissions, click the button below to request.": "Fehlende Medienberechtigungen. Drücke auf den Knopf unten, um sie anzufordern.",
     "Request media permissions": "Medienberechtigungen anfordern",
@@ -1191,9 +1191,9 @@
     "Join millions for free on the largest public server": "Schließe dich kostenlos auf dem größten öffentlichen Server Millionen von Menschen an",
     "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Stellt ¯\\_(ツ)_/¯ einer Klartextnachricht voran",
     "Changes your display nickname in the current room only": "Ändert den Anzeigenamen ausschließlich für den aktuellen Raum",
-    "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s aktivierte Abzeichen der Gruppen %(groups)s für diesen Raum.",
-    "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s deaktivierte Abzeichen der Gruppen %(groups)s in diesem Raum.",
-    "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s aktivierte Abzeichen von %(newGroups)s und deaktivierte die Abzeichen von %(oldGroups)s in diesem Raum.",
+    "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s hat Abzeichen der Gruppen %(groups)s für diesen Raum aktiviert.",
+    "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s hat Abzeichen der Gruppen %(groups)s in diesem Raum deaktiviert.",
+    "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s hat Abzeichen von %(newGroups)s aktiviert und von %(oldGroups)s deaktiviert.",
     "User %(userId)s is already in the room": "Nutzer:in %(userId)s ist bereits im Raum",
     "The user must be unbanned before they can be invited.": "Die Verbannung des/der Nutzer:in muss aufgehoben werden, bevor er/sie eingeladen werden kann.",
     "Show read receipts sent by other users": "Zeige Lesebestätigungen anderer Benutzer",
@@ -1206,7 +1206,7 @@
     "Change history visibility": "Ändere Sichtbarkeit der Historie",
     "Change permissions": "Ändere Berechtigungen",
     "Change topic": "Ändere das Thema",
-    "Modify widgets": "Ändere Widgets",
+    "Modify widgets": "Widgets bearbeiten",
     "Default role": "Standard Rolle",
     "Send messages": "Nachrichten senden",
     "Invite users": "Benutzer:innen einladen",
@@ -1255,8 +1255,8 @@
     "Ask your %(brand)s admin to check <a>your config</a> for incorrect or duplicate entries.": "Wende dich an deinen %(brand)s Admin um <a>deine Konfiguration</a> auf ungültige oder doppelte Einträge zu überprüfen.",
     "Unexpected error resolving identity server configuration": "Ein unerwarteter Fehler ist beim Laden der Identitätsserver-Konfiguration aufgetreten",
     "Cannot reach identity server": "Der Identitätsserver ist nicht erreichbar",
-    "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.": "Du kannst dich registrieren, aber manche Funktionen werden nicht verfügbar sein bis der Identitätsserver wieder online ist. Wenn diese Warnmeldung weiterhin angezeigt wird, überprüfe deine Konfiguration oder kontaktiere deinen Server-Administrator.",
-    "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.": "Du kannst dein Passwort zurücksetzen, aber manche Funktionen werden nicht verfügbar sein, bis der Identitätsserver wieder online ist. Wenn du diese Warnmeldung weiterhin siehst, überprüfe deine Konfiguration oder kontaktiere deinen Server-Administrator.",
+    "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.": "Du kannst dich registrieren, aber manche Funktionen werden erst wieder verfügbar sein, wenn der Identitätsserver wieder online ist. Wenn diese Warnmeldung weiterhin angezeigt wird, überprüfe deine Konfiguration oder kontaktiere die Server-Administration.",
+    "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.": "Du kannst dein Passwort zurücksetzen, aber manche Funktionen werden nicht verfügbar sein, bis der Identitätsserver wieder online ist. Wenn du diese Warnmeldung weiterhin siehst, überprüfe deine Konfiguration oder kontaktiere die Server-Administration.",
     "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.": "Du kannst dich einloggen, aber manche Funktionen werden nicht verfügbar sein bis der Identitätsserver wieder online ist. Wenn du diese Warnmeldung weiterhin siehst, überprüfe deine Konfiguration oder kontaktiere deinen Server-Administrator.",
     "No homeserver URL provided": "Keine Heimserver-URL angegeben",
     "Unexpected error resolving homeserver configuration": "Ein unerwarteter Fehler ist beim Laden der Heimserver-Konfiguration aufgetreten",
@@ -1300,14 +1300,14 @@
     "You do not have the required permissions to use this command.": "Du hast nicht die erforderlichen Berechtigungen, um diesen Befehl zu verwenden.",
     "Multiple integration managers": "Mehrere Integrationsmanager",
     "Public Name": "Öffentlicher Name",
-    "Identity Server URL must be HTTPS": "Die Identity Server-URL muss HTTPS sein",
+    "Identity Server URL must be HTTPS": "Die Identity-Server-URL über HTTPS erreichbar sein",
     "Could not connect to Identity Server": "Verbindung zum Identitätsserver konnte nicht hergestellt werden",
     "Checking server": "Server wird überprüft",
     "Identity server has no terms of service": "Der Identitätsserver hat keine Nutzungsbedingungen",
     "Disconnect": "Trennen",
     "Identity Server": "Identitätsserver",
     "Use an identity server": "Benutze einen Identitätsserver",
-    "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "Benutze einen Identitätsserver, um andere mittels E-Mail einzuladen. Klicke auf fortfahren, um den Standard-Identitätsserver (%(defaultIdentityServerName)s) zu benutzen oder gehe in die Einstellung und gib einen anderen Server an.",
+    "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "Benutze einen Identitätsserver, um andere mittels E-Mail einzuladen. Klicke auf fortfahren, um den Standard-Identitätsserver (%(defaultIdentityServerName)s) zu benutzen oder ändere ihn in den Einstellungen.",
     "ID": "ID",
     "Not a valid Identity Server (status code %(code)s)": "Kein gültiger Identitätsserver (status code %(code)s)",
     "Terms of service not accepted or the identity server is invalid.": "Die Nutzungsbedingungen wurden nicht akzeptiert oder der Identitätsserver ist ungültig.",
@@ -1316,7 +1316,7 @@
     "Do not use an identity server": "Keinen Identitätsserver verwenden",
     "Enter a new identity server": "Gib einen neuen Identitätsserver ein",
     "Clear personal data": "Persönliche Daten löschen",
-    "Disconnecting from your identity server will mean you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Wenn du die Verbindung zu deinem Identitätsserver trennst, heißt das, dass du nicht mehr von anderen Benutzern gefunden werden und auch andere nicht mehr per E-Mail oder Telefonnummer einladen kannst.",
+    "Disconnecting from your identity server will mean you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Wenn du die Verbindung zu deinem Identitätsserver trennst, kannst du nicht mehr von anderen Benutzern gefunden werden und andere nicht mehr per E-Mail oder Telefonnummer einladen.",
     "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Bitte frage den Administrator deines Heimservers (<code>%(homeserverDomain)s</code>) darum, einen TURN-Server einzurichten, damit Anrufe zuverlässig funktionieren.",
     "Disconnect from the identity server <idserver />?": "Verbindung zum Identitätsserver <idserver /> trennen?",
     "Add Email Address": "E-Mail-Adresse hinzufügen",
@@ -1341,11 +1341,11 @@
     "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 und Servern, die du blockiert hast - verlasse diesen Raum nicht!",
     "Accept <policyLink /> to continue:": "Akzeptiere <policyLink />, um fortzufahren:",
-    "Change identity server": "Wechsle den Identitätsserver",
+    "Change identity server": "Identitätsserver wechseln",
     "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.": "Du solltest deine <b>persönlichen Daten</b> vom Identitätsserver <idserver /> entfernen, bevor du die Verbindung trennst. Leider ist der Identitätsserver <idserver /> derzeit offline oder kann nicht erreicht werden.",
     "You should:": "Du solltest:",
     "check your browser plugins for anything that might block the identity server (such as Privacy Badger)": "Überprüfe deinen Browser auf Erweiterungen, die den Identitätsserver blockieren könnten (z.B. Privacy Badger)",
-    "Error upgrading room": "Fehler beim Raum-Aufrüsten",
+    "Error upgrading room": "Fehler beim Aktualisieren des Raumes",
     "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)",
@@ -1374,7 +1374,7 @@
     "Later": "Später",
     "Review": "Überprüfen",
     "Verify": "Verifizieren",
-    "Decline (%(counter)s)": "Ablehnen (%(counter)s)",
+    "Decline (%(counter)s)": "(%(counter)s) ablehnen",
     "not found": "nicht gefunden",
     "rooms.": "Räumen zu speichern.",
     "Manage": "Verwalten",
@@ -1437,7 +1437,7 @@
     "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Dein Passwort wurde erfolgreich geändert. Du erhältst keine Push-Benachrichtigungen zu anderen Sitzungen, bis du dich wieder bei diesen anmeldest",
     "Notification sound": "Benachrichtigungston",
     "Set a new custom sound": "Setze einen neuen benutzerdefinierten Ton",
-    "Browse": "Durchsuche",
+    "Browse": "Durchsuchen",
     "Direct Messages": "Direktnachrichten",
     "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "Du kannst <code>/help</code> benutzen, um verfügbare Befehle aufzulisten. Willst du dies als Nachricht senden?",
     "Direct message": "Direktnachricht",
@@ -1507,7 +1507,7 @@
     "Compare unique emoji": "Vergleiche einzigartige Emojis",
     "Start": "Starte",
     "Discovery": "Kontakte",
-    "Done": "Erledigt",
+    "Done": "Fertig",
     "Trusted": "Vertrauenswürdig",
     "Not trusted": "Nicht vertrauenswürdig",
     "%(count)s verified sessions|one": "1 verifizierte Sitzung",
@@ -1530,8 +1530,8 @@
     "Explore": "Erkunde",
     "Explore rooms": "Räume erkunden",
     "Maximize apps": "Apps maximieren",
-    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "Dein bereitgestellter Signaturschlüssel passt zu dem Schlüssel, der von %(userId)s's Sitzung %(deviceId)s empfangen wurde. Sitzung wird als verifiziert markiert.",
-    "Match system theme": "An System-Design anpassen",
+    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "Dein bereitgestellter Signaturschlüssel passt zum Schlüssel, der von %(userId)s's Sitzung %(deviceId)s empfangen wurde. Sitzung wird als verifiziert markiert.",
+    "Match system theme": "An Systemdesign anpassen",
     "Verify this session by completing one of the following:": "Verifiziere diese Sitzung, indem du eine der folgenden Aktionen ausführst:",
     "Your homeserver does not support session management.": "Dein Heimserver unterstützt keine Sitzungsverwaltung.",
     "Unable to load session list": "Sitzungsliste kann nicht geladen werden",
@@ -1562,7 +1562,7 @@
     "You're previewing %(roomName)s. Want to join it?": "Du betrachtest %(roomName)s. Willst du beitreten?",
     "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s hat die alternative Adresse 2%(addresses)s für diesen Raum hinzugefügt.",
     "%(senderName)s changed the addresses for this room.": "%(senderName)s hat die Adresse für diesen Raum geändert.",
-    "Displays information about a user": "Zeigt Informationen über ein/e Benutzer!n",
+    "Displays information about a user": "Zeigt Informationen über Benutzer:in",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s hat den Raumnamen von %(oldRoomName)s zu %(newRoomName)s geändert.",
     "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s hat die alternative Adresse %(addresses)s für diesen Raum hinzugefügt.",
     "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s hat die alternativen Adressen %(addresses)s für diesen Raum entfernt.",
@@ -1654,7 +1654,7 @@
     "Support adding custom themes": "Unterstütze das Hinzufügen von benutzerdefinierten Designs",
     "Ask this user to verify their session, or manually verify it below.": "Bitte diese/n Nutzer:in, seine/ihre Sitzung zu verifizieren, oder verifiziere diese unten manuell.",
     "a few seconds from now": "in ein paar Sekunden",
-    "Manually verify all remote sessions": "Verifiziere alle Remotesitzungen",
+    "Manually verify all remote sessions": "Alle Remotesitzungen manuell verifizieren",
     "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…",
@@ -1724,7 +1724,7 @@
     "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.",
-    "Send a bug report with logs": "Sende einen Fehlerbericht mit Logs",
+    "Send a bug report with logs": "Einen Fehlerbericht mit Logs senden",
     "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.",
     "You signed in to a new session without verifying it:": "Du hast dich in einer neuen Sitzung angemeldet ohne sie zu verifizieren:",
@@ -2186,7 +2186,7 @@
     "Font scaling": "Schriftskalierung",
     "Font size": "Schriftgröße",
     "IRC display name width": "Breite des IRC Anzeigenamens",
-    "Size must be a number": "Größe muss eine Zahl sein",
+    "Size must be a number": "Schriftgröße muss eine Zahl sein",
     "Custom font size can only be between %(min)s pt and %(max)s pt": "Eigene Schriftgröße kann nur eine Zahl zwischen %(min)s pt und %(max)s pt sein",
     "Use between %(min)s pt and %(max)s pt": "Verwende eine Zahl zwischen %(min)s pt und %(max)s pt",
     "Appearance": "Erscheinungsbild",
@@ -2197,8 +2197,8 @@
     "Room name or address": "Raumname oder -adresse",
     "Joins room with given address": "Tritt dem Raum unter der angegebenen Adresse bei",
     "Unrecognised room address:": "Unbekannte Raumadresse:",
-    "Help us improve %(brand)s": "Hilf uns %(brand)s zu verbessern",
-    "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "Hilf uns %(brand)s zu verbessern, indem du <UsageDataLink>anonyme Nutzungsdaten</UsageDataLink> schickst. Dies wird ein <PolicyLink>Cookie</PolicyLink> verwenden.",
+    "Help us improve %(brand)s": "Hilf uns, %(brand)s zu verbessern",
+    "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "Hilf uns, %(brand)s zu verbessern, indem du <UsageDataLink>anonyme Nutzungsdaten</UsageDataLink> schickst. Dies wird ein <PolicyLink>Cookie</PolicyLink> verwenden.",
     "I want to help": "Ich möchte helfen",
     "Your homeserver has exceeded its user limit.": "Dein Heimserver hat das Benutzerlimit erreicht.",
     "Your homeserver has exceeded one of its resource limits.": "Dein Heimserver hat eine seiner Ressourcengrenzen erreicht.",
@@ -2322,7 +2322,7 @@
     "You changed the room topic": "Du hast das Raumthema geändert",
     "%(senderName)s changed the room topic": "%(senderName)s hat das Raumthema geändert",
     "New spinner design": "Neue Warteanimation",
-    "Use a more compact ‘Modern’ layout": "Verwende ein kompakteres 'modernes' Layout",
+    "Use a more compact ‘Modern’ layout": "Kompakteres 'modernes' Layout verwenden",
     "Message deleted on %(date)s": "Nachricht am %(date)s gelöscht",
     "Wrong file type": "Falscher Dateityp",
     "Wrong Recovery Key": "Falscher Wiederherstellungsschlüssel",
@@ -2338,7 +2338,7 @@
     "Use your account to sign in to the latest version": "Melde dich mit deinem Account in der neuesten Version an",
     "* %(senderName)s %(emote)s": "* %(senderName)s %(emote)s",
     "Enable advanced debugging for the room list": "Erweiterte Fehlersuche für die Raumliste aktivieren",
-    "Enable experimental, compact IRC style layout": "Kompaktes, experimentelles Layout im IRC-Stil aktivieren",
+    "Enable experimental, compact IRC style layout": "Kompaktes Layout im IRC-Stil verwenden(experimentell)",
     "User menu": "Benutzermenü",
     "%(brand)s Web": "%(brand)s Web",
     "%(brand)s Desktop": "%(brand)s Desktop",
@@ -2469,8 +2469,8 @@
     "About": "Über",
     "%(count)s people|other": "%(count)s Personen",
     "%(count)s people|one": "%(count)s Person",
-    "Show files": "Dateien anzeigen",
-    "Room settings": "Raum-Einstellungen",
+    "Show files": "Gesendete Dateien",
+    "Room settings": "Raumeinstellungen",
     "Take a picture": "Foto aufnehmen",
     "Pin to room": "An Raum anheften",
     "You can only pin 2 apps at a time": "Du kannst nur 2 Apps gleichzeitig anheften",
@@ -2556,7 +2556,7 @@
     "Takes the call in the current room off hold": "Beendet das Halten des Anrufs",
     "Places the call in the current room on hold": "Den aktuellen Anruf halten",
     "Uzbekistan": "Usbekistan",
-    "Send stickers into this room": "Stickers in diesen Raum senden",
+    "Send stickers into this room": "Sticker in diesen Raum senden",
     "Send stickers into your active room": "Sticker in deinen aktiven Raum senden",
     "Change which room you're viewing": "Ändern, welchen Raum du siehst",
     "Change the topic of this room": "Das Thema von diesem Raum ändern",
@@ -2571,7 +2571,7 @@
     "See when the avatar changes in this room": "Sehen wenn der Avatar sich in diesem Raum ändert",
     "Change the avatar of your active room": "Den Avatar deines aktiven Raums ändern",
     "See when the avatar changes in your active room": "Sehen wenn ein Avatar in deinem aktiven Raum geändert wird",
-    "Send stickers to this room as you": "Einen Sticker in diesen Raum als du senden",
+    "Send stickers to this room as you": "Einen Sticker in diesen Raum senden",
     "See when a sticker is posted in this room": "Sehe wenn ein Sticker in diesen Raum gesendet wird",
     "Send stickers to your active room as you": "Einen Sticker als du in deinen aktiven Raum senden",
     "See when anyone posts a sticker to your active room": "Sehen, wenn jemand einen Sticker in deinen aktiven Raum sendet",
@@ -2581,7 +2581,7 @@
     "See <b>%(eventType)s</b> events posted to this room": "In diesem Raum gesendete <b>%(eventType)s</b>-Events anzeigen",
     "Send <b>%(eventType)s</b> events as you in your active room": "<b>%(eventType)s</b>-Events als du in deinem aktiven Raum senden",
     "See <b>%(eventType)s</b> events posted to your active room": "In deinem aktiven Raum gesendete <b>%(eventType)s</b>-Events anzeigen",
-    "The <b>%(capability)s</b> capability": "Die <b>%(capability)s</b> Fähigkeit",
+    "The <b>%(capability)s</b> capability": "Die <b>%(capability)s</b>-Fähigkeit",
     "Send messages as you in this room": "Nachrichten als du in diesem Raum senden",
     "Send messages as you in your active room": "Eine Nachricht als du in deinen aktiven Raum senden",
     "See messages posted to this room": "In diesen Raum gesendete Nachrichten anzeigen",
@@ -2592,7 +2592,7 @@
     "See text messages posted to your active room": "In deinen aktiven Raum gesendete Textnachrichten anzeigen",
     "Send emotes as you in this room": "Emojis als du in diesen Raum senden",
     "Send emotes as you in your active room": "Emojis als du in deinen aktiven Raum senden",
-    "See emotes posted to this room": "In diesem Raum gesendete Emojis anzeigen",
+    "See emotes posted to this room": "In diesen Raum gesendete Emojis anzeigen",
     "See emotes posted to your active room": "In deinen aktiven Raum gesendete Emojis anzeigen",
     "See videos posted to your active room": "In deinen aktiven Raum gesendete Videos anzeigen",
     "See videos posted to this room": "In diesen Raum gesendete Videos anzeigen",
@@ -2619,7 +2619,7 @@
     "Use Command + Enter to send a message": "Benutze Betriebssystemtaste + Enter um eine Nachricht zu senden",
     "Use Ctrl + Enter to send a message": "Benutze Strg + Enter um eine Nachricht zu senden",
     "Call Paused": "Anruf pausiert",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "Verschlüsselte Nachrichten sicher lokal zwischenspeichern, um sie in Suchergebnissen finden zu können. Es werden %(size)s benötigt, um die Nachrichten von den Räumen %(rooms)s zu speichern.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "Verschlüsselte Nachrichten sicher lokal zwischenspeichern, um sie in Suchergebnissen finden zu können. Es werden %(size)s benötigt, um die Nachrichten von %(rooms)s Räumen zu speichern.",
     "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "Verschlüsselte Nachrichten sicher lokal zwischenspeichern, um sie in Suchergebnissen finden zu können. Es werden %(size)s benötigt, um die Nachrichten vom Raum %(rooms)s zu speichern.",
     "Only the two of you are in this conversation, unless either of you invites anyone to join.": "Nur ihr zwei seid in dieser Konversation, außer einer von euch lädt jemanden neues ein.",
     "This is the beginning of your direct message history with <displayName/>.": "Dies ist der Beginn deiner Direktnachrichtenhistorie mit <displayName/>.",
@@ -2968,7 +2968,7 @@
     "Prepends ┬──┬ ノ( ゜-゜ノ) to a plain-text message": "Stellt ┬──┬ ノ( ゜-゜ノ) einer Klartextnachricht voran",
     "Prepends (╯°□°）╯︵ ┻━┻ to a plain-text message": "Stellt (╯°□°）╯︵ ┻━┻ einer Klartextnachricht voran",
     "Effects": "Effekte",
-    "You've reached the maximum number of simultaneous calls.": "Du hast die maximale Anzahl gleichzeitiger Anrufe erreicht.",
+    "You've reached the maximum number of simultaneous calls.": "Du hast die maximale Anzahl gleichzeitig möglicher Anrufe erreicht.",
     "Too Many Calls": "Zu viele Anrufe",
     "Call failed because webcam or microphone could not be accessed. Check that:": "Der Anruf ist fehlgeschlagen, weil nicht auf die Webcam oder der das Mikrofon zugegriffen werden konnte. Prüfe nach, ob:",
     "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "Der Anruf ist fehlgeschlagen, weil nicht auf das Mikrofon zugegriffen werden konnte. Prüfe noch einmal nach, ob das Mikrofon angesteckt und richtig konfiguriert ist.",
@@ -3004,7 +3004,7 @@
     "Dial pad": "Wähltastatur",
     "There was an error looking up the phone number": "Beim Suchen der Telefonnummer ist ein Fehler aufgetreten",
     "Change which room, message, or user you're viewing": "Ändere welchen Raum, Nachricht oder Nutzer:in du siehst",
-    "Unable to look up phone number": "Telefonnummer kann nicht gesucht werden",
+    "Unable to look up phone number": "Telefonnummer konnte nicht gefunden werden",
     "This session has detected that your Security Phrase and key for Secure Messages have been removed.": "In dieser Sitzung wurde festgestellt, dass deine Sicherheitsphrase und dein Schlüssel für sichere Nachrichten entfernt wurden.",
     "A new Security Phrase and key for Secure Messages have been detected.": "Eine neue Sicherheitsphrase und ein neuer Schlüssel für sichere Nachrichten wurden erkannt.",
     "Make a copy of your Security Key": "Mache eine Kopie von deinem Sicherheitsschlüssel",
@@ -3040,7 +3040,7 @@
     "Use app for a better experience": "Nutze die App für eine bessere Erfahrung",
     "We asked the browser to remember which homeserver you use to let you sign in, but unfortunately your browser has forgotten it. Go to the sign in page and try again.": "Wir haben deinen Browser gebeten, sich zu merken, bei welchem Homeserver du dich anmeldest, aber dein Browser hat dies leider vergessen. Gehe zur Anmeldeseite und versuche es erneut.",
     "Show stickers button": "Sticker-Schaltfläche anzeigen",
-    "Your homeserver rejected your log in attempt. This could be due to things just taking too long. Please try again. If this continues, please contact your homeserver administrator.": "Dein Homeserver hat deinen Anmeldeversuch abgelehnt. Dies könnte daran liegen, dass der Prozess einfach zu lange dauert. Bitte versuche es erneut. Wenn dies so weitergeht, wende dich bitte an deine Homeserver-Administrator.",
+    "Your homeserver rejected your log in attempt. This could be due to things just taking too long. Please try again. If this continues, please contact your homeserver administrator.": "Dein Homeserver hat deinen Anmeldeversuch abgelehnt. Vielleicht dauert der Prozess einfach zu lange. Bitte versuche es erneut. Wenn dies öfters passiert, wende dich bitte an deine Homeserver-Administration.",
     "Your homeserver was unreachable and was not able to log you in. Please try again. If this continues, please contact your homeserver administrator.": "Dein Homeserver war nicht erreichbar und konnte dich nicht anmelden. Bitte versuche es erneut. Wenn dies so weitergeht, wende dich bitte an deinem Homeserver-Administrator.",
     "We couldn't log you in": "Wir konnten dich nicht anmelden",
     "Windows": "Fenster",
@@ -3110,5 +3110,7 @@
     "Delete": "Löschen",
     "This homeserver has been blocked by its administrator.": "Dieser Heimserver wurde von ihrer Administration geblockt.",
     "You're already in a call with this person.": "Du bist schon in einem Anruf mit dieser Person.",
-    "Already in call": "Schon im Anruf"
+    "Already in call": "Schon im Anruf",
+    "Invite people": "Personen einladen",
+    "Jump to the bottom of the timeline when you send a message": "Nach dem Senden einer Nachricht im Chatverlauf nach unten scrollen"
 }

From c2f6b5a13b6ebef634fdea0d25ad4949d14ee073 Mon Sep 17 00:00:00 2001
From: Sven Grewe <svengrewe@posteo.de>
Date: Fri, 12 Mar 2021 17:56:31 +0000
Subject: [PATCH 305/420] Translated using Weblate (German)

Currently translated at 96.7% (2795 of 2889 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
---
 src/i18n/strings/de_DE.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 0981cf3f3d..7ee639ff16 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -12,10 +12,10 @@
     "Name": "Name",
     "Session ID": "Sitzungs-ID",
     "Displays action": "Zeigt Aktionen an",
-    "Bans user with given id": "Verbannt den/die Benutzer:in mit der angegebenen ID",
+    "Bans user with given id": "Verbannt den Benutzer mit der angegebenen ID",
     "Deops user with given id": "Setzt das Berechtigungslevel des/der Benutzer:in mit der angegebenen ID zurück",
-    "Invites user with given id to current room": "Lädt den/die Benutzer:in mit der angegebenen ID in den aktuellen Raum ein",
-    "Kicks user with given id": "Benutzer:in mit der angegebenen ID kicken",
+    "Invites user with given id to current room": "Lädt den Benutzer mit der angegebenen ID in den aktuellen Raum ein",
+    "Kicks user with given id": "Benutzer mit der angegebenen ID kicken",
     "Changes your display nickname": "Ändert deinen Anzeigenamen",
     "Change Password": "Passwort ändern",
     "Searches DuckDuckGo for results": "Verwendet DuckDuckGo für Suchergebnisse",
@@ -426,7 +426,7 @@
     "Unignored user": "Benutzer:in nicht mehr ignoriert",
     "Ignored user": "Benutzer:in ignoriert",
     "Stops ignoring a user, showing their messages going forward": "Benutzer:in nicht mehr ignorieren und neue Nachrichten wieder anzeigen",
-    "Ignores a user, hiding their messages from you": "Ignoriert eine:n Benutzer:in und verbirgt dessen/deren Nachrichten",
+    "Ignores a user, hiding their messages from you": "Ignoriert einen Benutzer und verbirgt dessen Nachrichten",
     "Banned by %(displayName)s": "Verbannt von %(displayName)s",
     "Description": "Beschreibung",
     "Unable to accept invite": "Einladung kann nicht angenommen werden",
@@ -1243,7 +1243,7 @@
     "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Momentan ist es nicht möglich mit einer Datei zu antworten. Möchtest Du die Datei hochladen ohne zu antworten?",
     "The file '%(fileName)s' failed to upload.": "Die Datei \"%(fileName)s\" konnte nicht hochgeladen werden.",
     "Changes your avatar in this current room only": "Ändert deinen Avatar für diesen Raum",
-    "Unbans user with given ID": "Hebt die Verbannung des/der Benutzer:in mit der angegebenen ID auf",
+    "Unbans user with given ID": "Entbannt den Benutzer mit der angegebenen ID",
     "Sends the given message coloured as a rainbow": "Sendet die Nachricht in Regenbogenfarben",
     "Adds a custom widget by URL to the room": "Fügt ein Benutzer-Widget über eine URL zum Raum hinzu",
     "Please supply a https:// or http:// widget URL": "Bitte gib eine https:// oder http:// Widget-URL an",

From 15c546cdbc24bc7f342498c530968b3feef59c41 Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Fri, 12 Mar 2021 17:50:26 +0000
Subject: [PATCH 306/420] Translated using Weblate (German)

Currently translated at 96.7% (2795 of 2889 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-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 7ee639ff16..18872070c9 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -416,7 +416,7 @@
     "You are now ignoring %(userId)s": "%(userId)s wird jetzt ignoriert",
     "You are no longer ignoring %(userId)s": "%(userId)s wird nicht mehr ignoriert",
     "Leave": "Verlassen",
-    "Failed to invite the following users to %(groupId)s:": "Die folgenden Benutzer konnten nicht in die Gruppe %(groupId)s eingeladen werden:",
+    "Failed to invite the following users to %(groupId)s:": "Die folgenden Benutzer:innen konnten nicht in die Gruppe %(groupId)s eingeladen werden:",
     "Leave %(groupName)s?": "%(groupName)s verlassen?",
     "Add a Room": "Raum hinzufügen",
     "Add a User": "Benutzer:in hinzufügen",
@@ -430,7 +430,7 @@
     "Banned by %(displayName)s": "Verbannt von %(displayName)s",
     "Description": "Beschreibung",
     "Unable to accept invite": "Einladung kann nicht angenommen werden",
-    "Failed to invite users to %(groupId)s": "Benutzer konnten nicht in %(groupId)s eingeladen werden",
+    "Failed to invite users to %(groupId)s": "Benutzer:innen konnten nicht in %(groupId)s eingeladen werden",
     "Unable to reject invite": "Einladung konnte nicht abgelehnt werden",
     "Who would you like to add to this summary?": "Wen möchtest zu dieser Übersicht hinzufügen?",
     "Add to summary": "Zur Übersicht hinzufügen",
@@ -469,7 +469,7 @@
     "Which rooms would you like to add to this community?": "Welche Räume sollen zu dieser Community hinzugefügt werden?",
     "Add rooms to the community": "Räume zur Community hinzufügen",
     "Add to community": "Zur Community hinzufügen",
-    "Failed to invite users to community": "Benutzer konnten nicht in die Community eingeladen werden",
+    "Failed to invite users to community": "Benutzer:innen konnten nicht in die Community eingeladen werden",
     "Communities": "Communities",
     "Invalid community ID": "Ungültige Community-ID",
     "'%(groupId)s' is not a valid community ID": "'%(groupId)s' ist keine gültige Community-ID",

From 67e2ae99880aa2d45b6bcf8f1fb8d2b202153f7a Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 16 Mar 2021 15:42:03 +0000
Subject: [PATCH 307/420] Make some dispatches async

It looks like these dispatches were being dispatched while already
dispatching, causing soft crashes (although I can't see where the
first dispatch was from). Either way, seems like these didn't need
to be sync.
---
 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 15e90a383a..936eb819ba 100644
--- a/src/components/structures/LoggedInView.tsx
+++ b/src/components/structures/LoggedInView.tsx
@@ -240,10 +240,10 @@ class LoggedInView extends React.Component<IProps, IState> {
             onCollapsed: (_collapsed) => {
                 collapsed = _collapsed;
                 if (_collapsed) {
-                    dis.dispatch({action: "hide_left_panel"}, true);
+                    dis.dispatch({action: "hide_left_panel"});
                     window.localStorage.setItem("mx_lhs_size", '0');
                 } else {
-                    dis.dispatch({action: "show_left_panel"}, true);
+                    dis.dispatch({action: "show_left_panel"});
                 }
             },
             onResized: (_size) => {

From 5ce3a05867e839eb41f66773899c176c3cbd80dc Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 16 Mar 2021 16:34:28 +0000
Subject: [PATCH 308/420] Update _SpacePanel.scss

---
 res/css/structures/_SpacePanel.scss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/res/css/structures/_SpacePanel.scss b/res/css/structures/_SpacePanel.scss
index afcf48ec4d..d3e7d7efee 100644
--- a/res/css/structures/_SpacePanel.scss
+++ b/res/css/structures/_SpacePanel.scss
@@ -147,6 +147,8 @@ $activeBorderColor: $secondary-fg-color;
 
         .mx_SpaceButton_toggleCollapse {
             width: $gutterSize;
+            // negative margin to place it correctly even with the complex
+            // 4px selection border each space button has when active
             margin-right: -4px;
             height: 20px;
             mask-position: center;

From 451a3aaa3f6ccd7679c3bee5a57f2c6c0fb4fc62 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 16 Mar 2021 13:50:43 -0600
Subject: [PATCH 309/420] Work around more cases where a rageshake server might
 not be present

We already do this for a number of other places (slash commands, help section of settings, etc) - these places appear to have been missed, though.
---
 .../views/dialogs/FeedbackDialog.js           | 23 ++++++----
 .../views/dialogs/RoomUpgradeWarningDialog.js | 42 ++++++++++++-------
 src/i18n/strings/en_EN.json                   |  5 ++-
 3 files changed, 46 insertions(+), 24 deletions(-)

diff --git a/src/components/views/dialogs/FeedbackDialog.js b/src/components/views/dialogs/FeedbackDialog.js
index cbe26af6cc..d80a935573 100644
--- a/src/components/views/dialogs/FeedbackDialog.js
+++ b/src/components/views/dialogs/FeedbackDialog.js
@@ -100,6 +100,20 @@ export default (props) => {
         );
     }
 
+    let bugReports = null;
+    if (SdkConfig.get().bug_report_endpoint_url) {
+        bugReports = (
+            <p>{
+                _t("PRO TIP: If you start a bug, please submit <debugLogsLink>debug logs</debugLogsLink> " +
+                    "to help us track down the problem.", {}, {
+                    debugLogsLink: sub => (
+                        <AccessibleButton kind="link" onClick={onDebugLogsLinkClick}>{sub}</AccessibleButton>
+                    ),
+                })
+            }</p>
+        );
+    }
+
     return (<QuestionDialog
         className="mx_FeedbackDialog"
         hasCancelButton={!!hasFeedback}
@@ -120,14 +134,7 @@ export default (props) => {
                         },
                     })
                 }</p>
-                <p>{
-                    _t("PRO TIP: If you start a bug, please submit <debugLogsLink>debug logs</debugLogsLink> " +
-                        "to help us track down the problem.", {}, {
-                        debugLogsLink: sub => (
-                            <AccessibleButton kind="link" onClick={onDebugLogsLinkClick}>{sub}</AccessibleButton>
-                        ),
-                    })
-                }</p>
+                {bugReports}
             </div>
             { countlyFeedbackSection }
         </React.Fragment>}
diff --git a/src/components/views/dialogs/RoomUpgradeWarningDialog.js b/src/components/views/dialogs/RoomUpgradeWarningDialog.js
index 452ac56dff..c6ef2c6ae2 100644
--- a/src/components/views/dialogs/RoomUpgradeWarningDialog.js
+++ b/src/components/views/dialogs/RoomUpgradeWarningDialog.js
@@ -82,6 +82,33 @@ export default class RoomUpgradeWarningDialog extends React.Component {
 
         const title = this.state.isPrivate ? _t("Upgrade private room") : _t("Upgrade public room");
 
+        let bugReports = (
+            <p>
+                {_t(
+                    "This usually only affects how the room is processed on the server. If you're " +
+                    "having problems with your %(brand)s, please report a bug.", {brand},
+                )}
+            </p>
+        );
+        if (SdkConfig.get().bug_report_endpoint_url) {
+            bugReports = (
+                <p>
+                    {_t(
+                        "This usually only affects how the room is processed on the server. If you're " +
+                        "having problems with your %(brand)s, please <a>report a bug</a>.",
+                        {
+                            brand,
+                        },
+                        {
+                            "a": (sub) => {
+                                return <a href='#' onClick={this._openBugReportDialog}>{sub}</a>;
+                            },
+                        },
+                    )}
+                </p>
+            );
+        }
+
         return (
             <BaseDialog
                 className='mx_RoomUpgradeWarningDialog'
@@ -97,20 +124,7 @@ export default class RoomUpgradeWarningDialog extends React.Component {
                             "is unstable due to bugs, missing features or security vulnerabilities.",
                         )}
                     </p>
-                    <p>
-                        {_t(
-                            "This usually only affects how the room is processed on the server. If you're " +
-                            "having problems with your %(brand)s, please <a>report a bug</a>.",
-                            {
-                                brand,
-                            },
-                            {
-                                "a": (sub) => {
-                                    return <a href='#' onClick={this._openBugReportDialog}>{sub}</a>;
-                                },
-                            },
-                        )}
-                    </p>
+                    {bugReports}
                     <p>
                         {_t(
                             "You'll upgrade this room from <oldVersion /> to <newVersion />.",
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 63449eb99f..07d292a0e7 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2150,10 +2150,10 @@
     "Add comment": "Add comment",
     "Comment": "Comment",
     "There are two ways you can provide feedback and help us improve %(brand)s.": "There are two ways you can provide feedback and help us improve %(brand)s.",
+    "PRO TIP: If you start a bug, please submit <debugLogsLink>debug logs</debugLogsLink> to help us track down the problem.": "PRO TIP: If you start a bug, please submit <debugLogsLink>debug logs</debugLogsLink> to help us track down the problem.",
     "Feedback": "Feedback",
     "Report a bug": "Report a bug",
     "Please view <existingIssuesLink>existing bugs on Github</existingIssuesLink> first. No match? <newIssueLink>Start a new one</newIssueLink>.": "Please view <existingIssuesLink>existing bugs on Github</existingIssuesLink> first. No match? <newIssueLink>Start a new one</newIssueLink>.",
-    "PRO TIP: If you start a bug, please submit <debugLogsLink>debug logs</debugLogsLink> to help us track down the problem.": "PRO TIP: If you start a bug, please submit <debugLogsLink>debug logs</debugLogsLink> to help us track down the problem.",
     "Send feedback": "Send feedback",
     "Confirm abort of host creation": "Confirm abort of host creation",
     "Are you sure you wish to abort creation of the host? The process cannot be continued.": "Are you sure you wish to abort creation of the host? The process cannot be continued.",
@@ -2269,8 +2269,9 @@
     "Automatically invite users": "Automatically invite users",
     "Upgrade private room": "Upgrade private room",
     "Upgrade public room": "Upgrade public room",
-    "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.",
+    "This usually only affects how the room is processed on the server. If you're having problems with your %(brand)s, please report a bug.": "This usually only affects how the room is processed on the server. If you're having problems with your %(brand)s, please report a bug.",
     "This usually only affects how the room is processed on the server. If you're having problems with your %(brand)s, please <a>report a bug</a>.": "This usually only affects how the room is processed on the server. If you're having problems with your %(brand)s, please <a>report a bug</a>.",
+    "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.",
     "You'll upgrade this room from <oldVersion /> to <newVersion />.": "You'll upgrade this room from <oldVersion /> to <newVersion />.",
     "Resend": "Resend",
     "You're all caught up.": "You're all caught up.",

From c285b79a8dedc3a64a428d15cd4a4b8d50b59c97 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 16 Mar 2021 14:19:49 -0600
Subject: [PATCH 310/420] Add possibility to delay rageshake persistence in app
 startup

Even if the app takes a moment to set up persistence, this will still capture any logs before persistence happened.
---
 src/rageshake/rageshake.js | 32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/src/rageshake/rageshake.js b/src/rageshake/rageshake.js
index 8eb77bb3ae..b886f369df 100644
--- a/src/rageshake/rageshake.js
+++ b/src/rageshake/rageshake.js
@@ -434,15 +434,37 @@ function selectQuery(store, keyRange, resultMapper) {
 /**
  * Configure rage shaking support for sending bug reports.
  * Modifies globals.
+ * @param {boolean} setUpPersistence When true (default), the persistence will
+ * be set up immediately for the logs.
  * @return {Promise} Resolves when set up.
  */
-export function init() {
+export function init(setUpPersistence = true) {
     if (global.mx_rage_initPromise) {
         return global.mx_rage_initPromise;
     }
     global.mx_rage_logger = new ConsoleLogger();
     global.mx_rage_logger.monkeyPatch(window.console);
 
+    if (setUpPersistence) {
+        return tryInitStorage();
+    }
+
+    global.mx_rage_initPromise = Promise.resolve();
+    return global.mx_rage_initPromise;
+}
+
+/**
+ * Try to start up the rageshake storage for logs. If not possible (client unsupported)
+ * then this no-ops.
+ * @return {Promise} Resolves when complete.
+ */
+export function tryInitStorage() {
+    if (global.mx_rage_initStoragePromise) {
+        return global.mx_rage_initStoragePromise;
+    }
+
+    console.log("Configuring rageshake persistence...");
+
     // just *accessing* indexedDB throws an exception in firefox with
     // indexeddb disabled.
     let indexedDB;
@@ -452,11 +474,11 @@ export function init() {
 
     if (indexedDB) {
         global.mx_rage_store = new IndexedDBLogStore(indexedDB, global.mx_rage_logger);
-        global.mx_rage_initPromise = global.mx_rage_store.connect();
-        return global.mx_rage_initPromise;
+        global.mx_rage_initStoragePromise = global.mx_rage_store.connect();
+        return global.mx_rage_initStoragePromise;
     }
-    global.mx_rage_initPromise = Promise.resolve();
-    return global.mx_rage_initPromise;
+    global.mx_rage_initStoragePromise = Promise.resolve();
+    return global.mx_rage_initStoragePromise;
 }
 
 export function flush() {

From 097c2d8be0ca1dabca2d024347c72f9002901769 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 11 Mar 2021 21:28:40 -0700
Subject: [PATCH 311/420] Add labs flag for voice messages

---
 src/i18n/strings/en_EN.json | 1 +
 src/settings/Settings.ts    | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 07d292a0e7..1a66e0cfee 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -783,6 +783,7 @@
     "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s",
     "Change notification settings": "Change notification settings",
     "Spaces prototype. Incompatible with Communities, Communities v2 and Custom Tags. Requires compatible homeserver for some features.": "Spaces prototype. Incompatible with Communities, Communities v2 and Custom Tags. Requires compatible homeserver for some features.",
+    "Send and receive voice messages": "Send and receive voice messages",
     "Render LaTeX maths in messages": "Render LaTeX maths in messages",
     "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.": "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.",
     "New spinner design": "New spinner design",
diff --git a/src/settings/Settings.ts b/src/settings/Settings.ts
index 4f589ba49a..b718ddd8d2 100644
--- a/src/settings/Settings.ts
+++ b/src/settings/Settings.ts
@@ -128,6 +128,12 @@ export const SETTINGS: {[setting: string]: ISetting} = {
         default: false,
         controller: new ReloadOnChangeController(),
     },
+    "feature_voice_messages": {
+        isFeature: true,
+        displayName: _td("Send and receive voice messages"),
+        supportedLevels: LEVELS_FEATURE,
+        default: false,
+    },
     "feature_latex_maths": {
         isFeature: true,
         displayName: _td("Render LaTeX maths in messages"),

From be2e30df0d891b4df7fb78778c723a3b45b3fb1a Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 11 Mar 2021 22:05:47 -0700
Subject: [PATCH 312/420] Add an early voice recorder utility class

---
 package.json               |   1 +
 src/@types/global.d.ts     |   2 +
 src/index.js               |   2 +
 src/voice/VoiceRecorder.ts | 116 +++++++++++++++++++++++++++++++++++++
 yarn.lock                  |   5 ++
 5 files changed, 126 insertions(+)
 create mode 100644 src/voice/VoiceRecorder.ts

diff --git a/package.json b/package.json
index f8b4287197..a4b425d0cc 100644
--- a/package.json
+++ b/package.json
@@ -83,6 +83,7 @@
     "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
     "matrix-widget-api": "^0.1.0-beta.13",
     "minimist": "^1.2.5",
+    "opus-recorder": "^8.0.3",
     "pako": "^2.0.3",
     "parse5": "^6.0.1",
     "png-chunks-extract": "^1.0.0",
diff --git a/src/@types/global.d.ts b/src/@types/global.d.ts
index 4aa6df5488..051e5cc429 100644
--- a/src/@types/global.d.ts
+++ b/src/@types/global.d.ts
@@ -39,6 +39,7 @@ import {ModalWidgetStore} from "../stores/ModalWidgetStore";
 import { WidgetLayoutStore } from "../stores/widgets/WidgetLayoutStore";
 import VoipUserMapper from "../VoipUserMapper";
 import {SpaceStoreClass} from "../stores/SpaceStore";
+import {VoiceRecorder} from "../voice/VoiceRecorder";
 
 declare global {
     interface Window {
@@ -70,6 +71,7 @@ declare global {
         mxModalWidgetStore: ModalWidgetStore;
         mxVoipUserMapper: VoipUserMapper;
         mxSpaceStore: SpaceStoreClass;
+        mxVoiceRecorder: typeof VoiceRecorder;
     }
 
     interface Document {
diff --git a/src/index.js b/src/index.js
index 008e15ad90..1ef760dab9 100644
--- a/src/index.js
+++ b/src/index.js
@@ -28,3 +28,5 @@ export function resetSkin() {
 export function getComponent(componentName) {
     return Skinner.getComponent(componentName);
 }
+
+import "./voice/VoiceRecorder"; // TODO: @@ REMOVE
diff --git a/src/voice/VoiceRecorder.ts b/src/voice/VoiceRecorder.ts
new file mode 100644
index 0000000000..2764d94174
--- /dev/null
+++ b/src/voice/VoiceRecorder.ts
@@ -0,0 +1,116 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.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 Recorder from 'opus-recorder';
+import encoderPath from 'opus-recorder/dist/encoderWorker.min.js';
+import {MatrixClient} from "matrix-js-sdk/src/client";
+import CallMediaHandler from "../CallMediaHandler";
+import {sleep} from "../utils/promise";
+
+export class VoiceRecorder {
+    private recorder = new Recorder({
+        encoderPath, // magic from webpack
+        mediaTrackConstraints: <MediaTrackConstraints>{
+            deviceId: CallMediaHandler.getAudioInput(),
+        },
+        encoderSampleRate: 16000, // we could go down to 12khz, but we lose quality
+        encoderApplication: 2048, // voice (default is "audio")
+        streamPages: true, // so we can have a live EQ for the user
+        encoderFrameSize: 10, // we want updates fairly regularly for the UI
+    });
+    private buffer = new Uint8Array(0);
+    private mxc: string;
+    private recording = false;
+
+    public constructor(private client: MatrixClient) {
+        this.recorder.ondataavailable = (a: ArrayBuffer) => {
+            // TODO: @@ We'll have to decode each frame and convert it to an EQ to observe
+            console.log(a);
+            const buf = new Uint8Array(a);
+            const newBuf = new Uint8Array(this.buffer.length + buf.length);
+            newBuf.set(this.buffer, 0);
+            newBuf.set(buf, this.buffer.length);
+            this.buffer = newBuf;
+        };
+    }
+
+    public get isSupported(): boolean {
+        return !!Recorder.isRecordingSupported();
+    }
+
+    public get hasRecording(): boolean {
+        return this.buffer.length > 0;
+    }
+
+    public get mxcUri(): string {
+        if (!this.mxc) {
+            throw new Error("Recording has not been uploaded yet");
+        }
+        return this.mxc;
+    }
+
+    public async start(): Promise<void> {
+        if (this.mxc || this.hasRecording) {
+            throw new Error("Recording already prepared");
+        }
+        if (this.recording) {
+            throw new Error("Recording already in progress");
+        }
+        return this.recorder.start().then(() => this.recording = true);
+    }
+
+    public async stop(): Promise<Uint8Array> {
+        if (!this.recording) {
+            throw new Error("No recording to stop");
+        }
+        return new Promise<Uint8Array>(resolve => {
+            this.recorder.stop().then(() => {
+                this.recording = false;
+                return this.recorder.close();
+            }).then(() => resolve(this.buffer));
+        });
+    }
+
+    public async upload(): Promise<string> {
+        if (!this.hasRecording) {
+            throw new Error("No recording available to upload");
+        }
+
+        if (this.mxc) return this.mxc;
+
+        this.mxc = await this.client.uploadContent(new Blob([this.buffer], {
+            type: "audio/ogg",
+        }), {
+            onlyContentUri: false, // to stop the warnings in the console
+        }).then(r => r['content_uri']);
+        return this.mxc;
+    }
+
+    // TODO: @@ REMOVE
+    public async test() {
+        this.start()
+            .then(() => sleep(5000))
+            .then(() => this.stop())
+            .then(() => this.upload())
+            .then(() => this.client.sendMessage("!HKjSnKDluFnCCnjayl:localhost", {
+                body: "Voice message",
+                msgtype: "m.audio", // TODO
+                url: this.mxc,
+            }));
+    }
+}
+
+window.mxVoiceRecorder = VoiceRecorder;
diff --git a/yarn.lock b/yarn.lock
index 58686248f7..1763a42e75 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6096,6 +6096,11 @@ optionator@^0.9.1:
     type-check "^0.4.0"
     word-wrap "^1.2.3"
 
+opus-recorder@^8.0.3:
+  version "8.0.3"
+  resolved "https://registry.yarnpkg.com/opus-recorder/-/opus-recorder-8.0.3.tgz#f7b44f8f68500c9b96a15042a69f915fd9c1716d"
+  integrity sha512-8vXGiRwlJAavT9D3yYzukNVXQ8vEcKHcsQL/zXO24DQtJ0PLXvoPHNQPJrbMCdB4ypJgWDExvHF4JitQDL7dng==
+
 os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"

From b5d32d92f31a9d65f02ae048c55360aef9e58296 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 15 Mar 2021 22:16:58 -0600
Subject: [PATCH 313/420] Wire up a simple record button

---
 .../views/rooms/_BasicMessageComposer.scss    |  5 ++
 res/css/views/rooms/_MessageComposer.scss     |  4 +
 res/img/voip/mic-on-mask.svg                  |  3 +
 .../views/rooms/BasicMessageComposer.tsx      |  3 +
 src/components/views/rooms/MessageComposer.js | 31 ++++++--
 .../views/rooms/SendMessageComposer.js        |  2 +
 .../views/rooms/VoiceRecordComposerTile.tsx   | 74 +++++++++++++++++++
 src/i18n/strings/en_EN.json                   |  1 +
 src/voice/VoiceRecorder.ts                    | 12 +++
 9 files changed, 130 insertions(+), 5 deletions(-)
 create mode 100644 res/img/voip/mic-on-mask.svg
 create mode 100644 src/components/views/rooms/VoiceRecordComposerTile.tsx

diff --git a/res/css/views/rooms/_BasicMessageComposer.scss b/res/css/views/rooms/_BasicMessageComposer.scss
index e126e523a6..4f58c08617 100644
--- a/res/css/views/rooms/_BasicMessageComposer.scss
+++ b/res/css/views/rooms/_BasicMessageComposer.scss
@@ -66,6 +66,11 @@ limitations under the License.
                 }
             }
         }
+
+        &.mx_BasicMessageComposer_input_disabled {
+            pointer-events: none;
+            cursor: not-allowed;
+        }
     }
 
     .mx_BasicMessageComposer_AutoCompleteWrapper {
diff --git a/res/css/views/rooms/_MessageComposer.scss b/res/css/views/rooms/_MessageComposer.scss
index dea1b58741..e6c0cc3f46 100644
--- a/res/css/views/rooms/_MessageComposer.scss
+++ b/res/css/views/rooms/_MessageComposer.scss
@@ -227,6 +227,10 @@ limitations under the License.
     mask-image: url('$(res)/img/element-icons/room/composer/attach.svg');
 }
 
+.mx_MessageComposer_voiceMessage::before {
+    mask-image: url('$(res)/img/voip/mic-on-mask.svg');
+}
+
 .mx_MessageComposer_emoji::before {
     mask-image: url('$(res)/img/element-icons/room/composer/emoji.svg');
 }
diff --git a/res/img/voip/mic-on-mask.svg b/res/img/voip/mic-on-mask.svg
new file mode 100644
index 0000000000..418316b164
--- /dev/null
+++ b/res/img/voip/mic-on-mask.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="21" viewBox="0 0 20 21" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M6.09999 4.15C6.09999 1.99609 7.84608 0.25 9.99999 0.25C12.1539 0.25 13.9 1.99609 13.9 4.15V9.98254C13.9 12.1365 12.1539 13.8825 9.99999 13.8825C7.84608 13.8825 6.09999 12.1365 6.09999 9.98254V4.15ZM3.1748 8.73755C3.86516 8.73755 4.4248 9.29719 4.4248 9.98755C4.4248 13.0574 6.91483 15.5493 9.9915 15.5538C9.99433 15.5538 9.99717 15.5538 10 15.5538C10.0028 15.5538 10.0056 15.5538 10.0084 15.5538C13.085 15.5492 15.5748 13.0573 15.5748 9.98755C15.5748 9.29719 16.1344 8.73755 16.8248 8.73755C17.5152 8.73755 18.0748 9.29719 18.0748 9.98755C18.0748 14.0189 15.115 17.3576 11.25 17.9577V18.7513C11.25 19.4416 10.6904 20.0013 10 20.0013C9.30964 20.0013 8.75 19.4416 8.75 18.7513V17.9578C4.88483 17.3578 1.9248 14.0191 1.9248 9.98755C1.9248 9.29719 2.48445 8.73755 3.1748 8.73755Z" fill="#C1C6CD"/>
+</svg>
diff --git a/src/components/views/rooms/BasicMessageComposer.tsx b/src/components/views/rooms/BasicMessageComposer.tsx
index 5ab2b82a32..223a7a5395 100644
--- a/src/components/views/rooms/BasicMessageComposer.tsx
+++ b/src/components/views/rooms/BasicMessageComposer.tsx
@@ -93,6 +93,7 @@ interface IProps {
     placeholder?: string;
     label?: string;
     initialCaret?: DocumentOffset;
+    disabled?: boolean;
 
     onChange?();
     onPaste?(event: ClipboardEvent<HTMLDivElement>, model: EditorModel): boolean;
@@ -672,6 +673,7 @@ export default class BasicMessageEditor extends React.Component<IProps, IState>
         });
         const classes = classNames("mx_BasicMessageComposer_input", {
             "mx_BasicMessageComposer_input_shouldShowPillAvatar": this.state.showPillAvatar,
+            "mx_BasicMessageComposer_input_disabled": this.props.disabled,
         });
 
         const shortcuts = {
@@ -704,6 +706,7 @@ export default class BasicMessageEditor extends React.Component<IProps, IState>
                 aria-expanded={Boolean(this.state.autoComplete)}
                 aria-activedescendant={completionIndex >= 0 ? generateCompletionDomId(completionIndex) : undefined}
                 dir="auto"
+                aria-disabled={this.props.disabled}
             />
         </div>);
     }
diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index ccf097c4fd..2efda53bc2 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -33,6 +33,7 @@ import WidgetStore from "../../../stores/WidgetStore";
 import {UPDATE_EVENT} from "../../../stores/AsyncStore";
 import ActiveWidgetStore from "../../../stores/ActiveWidgetStore";
 import {replaceableComponent} from "../../../utils/replaceableComponent";
+import VoiceRecordComposerTile from "./VoiceRecordComposerTile";
 
 function ComposerAvatar(props) {
     const MemberStatusMessageAvatar = sdk.getComponent('avatars.MemberStatusMessageAvatar');
@@ -187,6 +188,7 @@ export default class MessageComposer extends React.Component {
             hasConference: WidgetStore.instance.doesRoomHaveConference(this.props.room),
             joinedConference: WidgetStore.instance.isJoinedToConferenceIn(this.props.room),
             isComposerEmpty: true,
+            haveRecording: false,
         };
     }
 
@@ -325,6 +327,10 @@ export default class MessageComposer extends React.Component {
         });
     }
 
+    onVoiceUpdate = (haveRecording: boolean) => {
+        this.setState({haveRecording});
+    };
+
     render() {
         const controls = [
             this.state.me ? <ComposerAvatar key="controls_avatar" me={this.state.me} /> : null,
@@ -346,17 +352,32 @@ export default class MessageComposer extends React.Component {
                     permalinkCreator={this.props.permalinkCreator}
                     replyToEvent={this.props.replyToEvent}
                     onChange={this.onChange}
-                />,
-                <UploadButton key="controls_upload" roomId={this.props.room.roomId} />,
-                <EmojiButton key="emoji_button" addEmoji={this.addEmoji} />,
+                    // TODO: TravisR - Disabling the composer doesn't work
+                    disabled={this.state.haveRecording}
+                />
             );
 
+            if (!this.state.haveRecording) {
+                controls.push(
+                    <UploadButton key="controls_upload" roomId={this.props.room.roomId} />,
+                    <EmojiButton key="emoji_button" addEmoji={this.addEmoji} />,
+                );
+            }
+
             if (SettingsStore.getValue(UIFeature.Widgets) &&
-                SettingsStore.getValue("MessageComposerInput.showStickersButton")) {
+                SettingsStore.getValue("MessageComposerInput.showStickersButton") &&
+                !this.state.haveRecording) {
                 controls.push(<Stickerpicker key="stickerpicker_controls_button" room={this.props.room} />);
             }
 
-            if (!this.state.isComposerEmpty) {
+            if (SettingsStore.getValue("feature_voice_messages")) {
+                controls.push(<VoiceRecordComposerTile
+                    key="controls_voice_record"
+                    room={this.props.room}
+                    onRecording={this.onVoiceUpdate} />);
+            }
+
+            if (!this.state.isComposerEmpty || this.state.haveRecording) {
                 controls.push(
                     <SendButton key="controls_send" onClick={this.sendMessage} />,
                 );
diff --git a/src/components/views/rooms/SendMessageComposer.js b/src/components/views/rooms/SendMessageComposer.js
index ba3076c07d..aed1bb36fe 100644
--- a/src/components/views/rooms/SendMessageComposer.js
+++ b/src/components/views/rooms/SendMessageComposer.js
@@ -120,6 +120,7 @@ export default class SendMessageComposer extends React.Component {
         permalinkCreator: PropTypes.object.isRequired,
         replyToEvent: PropTypes.object,
         onChange: PropTypes.func,
+        disabled: PropTypes.bool,
     };
 
     static contextType = MatrixClientContext;
@@ -556,6 +557,7 @@ export default class SendMessageComposer extends React.Component {
                     label={this.props.placeholder}
                     placeholder={this.props.placeholder}
                     onPaste={this._onPaste}
+                    disabled={this.props.disabled}
                 />
             </div>
         );
diff --git a/src/components/views/rooms/VoiceRecordComposerTile.tsx b/src/components/views/rooms/VoiceRecordComposerTile.tsx
new file mode 100644
index 0000000000..9ba3764524
--- /dev/null
+++ b/src/components/views/rooms/VoiceRecordComposerTile.tsx
@@ -0,0 +1,74 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.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 AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
+import {_t} from "../../../languageHandler";
+import React from "react";
+import {VoiceRecorder} from "../../../voice/VoiceRecorder";
+import {Room} from "matrix-js-sdk/src/models/room";
+import {MatrixClientPeg} from "../../../MatrixClientPeg";
+
+interface IProps {
+    room: Room;
+    onRecording: (haveRecording: boolean) => void;
+}
+
+interface IState {
+    recorder?: VoiceRecorder;
+}
+
+export default class VoiceRecordComposerTile extends React.PureComponent<IProps, IState> {
+    public constructor(props) {
+        super(props);
+
+        this.state = {
+            recorder: null, // not recording by default
+        };
+    }
+
+    private onStartVoiceMessage = async () => {
+        if (this.state.recorder) {
+            await this.state.recorder.stop();
+            const mxc = await this.state.recorder.upload();
+            MatrixClientPeg.get().sendMessage(this.props.room.roomId, {
+                body: "Voice message",
+                msgtype: "m.audio", // TODO
+                url: mxc,
+            });
+            this.setState({recorder: null});
+            this.props.onRecording(false);
+            return;
+        }
+        const recorder = new VoiceRecorder(MatrixClientPeg.get());
+        await recorder.start();
+        this.props.onRecording(true);
+        // TODO: Run through EQ component
+        recorder.rawData.onUpdate((frame) => {
+            console.log('@@ FRAME', frame);
+        });
+        this.setState({recorder});
+    };
+
+    public render() {
+        return (
+            <AccessibleTooltipButton
+                className="mx_MessageComposer_button mx_MessageComposer_voiceMessage"
+                onClick={this.onStartVoiceMessage}
+                title={_t('Record a voice message')}
+            />
+        );
+    }
+}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 1a66e0cfee..4654cb1f99 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1636,6 +1636,7 @@
     "Invited by %(sender)s": "Invited by %(sender)s",
     "Jump to first unread message.": "Jump to first unread message.",
     "Mark all as read": "Mark all as read",
+    "Record a voice message": "Record a voice message",
     "Error updating main address": "Error updating main address",
     "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.",
     "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.",
diff --git a/src/voice/VoiceRecorder.ts b/src/voice/VoiceRecorder.ts
index 2764d94174..df6621d00b 100644
--- a/src/voice/VoiceRecorder.ts
+++ b/src/voice/VoiceRecorder.ts
@@ -19,6 +19,7 @@ import encoderPath from 'opus-recorder/dist/encoderWorker.min.js';
 import {MatrixClient} from "matrix-js-sdk/src/client";
 import CallMediaHandler from "../CallMediaHandler";
 import {sleep} from "../utils/promise";
+import {SimpleObservable} from "matrix-widget-api";
 
 export class VoiceRecorder {
     private recorder = new Recorder({
@@ -34,6 +35,7 @@ export class VoiceRecorder {
     private buffer = new Uint8Array(0);
     private mxc: string;
     private recording = false;
+    private observable: SimpleObservable<Uint8Array>;
 
     public constructor(private client: MatrixClient) {
         this.recorder.ondataavailable = (a: ArrayBuffer) => {
@@ -44,9 +46,15 @@ export class VoiceRecorder {
             newBuf.set(this.buffer, 0);
             newBuf.set(buf, this.buffer.length);
             this.buffer = newBuf;
+            this.observable.update(buf); // send the frame over the observable
         };
     }
 
+    public get rawData(): SimpleObservable<Uint8Array> {
+        if (!this.recording) throw new Error("No observable when not recording");
+        return this.observable;
+    }
+
     public get isSupported(): boolean {
         return !!Recorder.isRecordingSupported();
     }
@@ -69,6 +77,10 @@ export class VoiceRecorder {
         if (this.recording) {
             throw new Error("Recording already in progress");
         }
+        if (this.observable) {
+            this.observable.close();
+        }
+        this.observable = new SimpleObservable<Uint8Array>();
         return this.recorder.start().then(() => this.recording = true);
     }
 

From b770253c887e93f54273ed225eb38330e76eaa47 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Thu, 11 Mar 2021 05:53:46 +0000
Subject: [PATCH 314/420] Translated using Weblate (Chinese (Traditional))

Currently translated at 99.9% (2887 of 2889 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
---
 src/i18n/strings/zh_Hant.json | 117 +++++++++++++++++++++++++++++++++-
 1 file changed, 116 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 64dab74139..e7d94be8e2 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -3090,5 +3090,120 @@
     "Setting ID": "設定 ID",
     "Failed to save settings": "儲存設定失敗",
     "Settings Explorer": "設定瀏覽程式",
-    "Show chat effects (animations when receiving e.g. confetti)": "顯示聊天效果（當收到如五彩紙屑時顯示動畫）"
+    "Show chat effects (animations when receiving e.g. confetti)": "顯示聊天效果（當收到如五彩紙屑時顯示動畫）",
+    "Original event source": "原始活動來源",
+    "Decrypted event source": "解密活動來源",
+    "We'll create rooms for each of them. You can add existing rooms after setup.": "我們將為每個專案建立聊天室。您可以在設定完成後新增既有的聊天室。",
+    "What projects are you working on?": "您正在從事哪些專案？",
+    "We'll create rooms for each topic.": "我們將為每個主題建立聊天室。",
+    "What are some things you want to discuss?": "您想討論什麼？",
+    "Inviting...": "邀請……",
+    "Invite by username": "透過使用者名稱邀請",
+    "Invite your teammates": "邀請您的隊友",
+    "Failed to invite the following users to your space: %(csvUsers)s": "無法邀請以下使用者加入您的空間：%(csvUsers)s",
+    "A private space for you and your teammates": "專為您與您的隊友設計的私人空間",
+    "Me and my teammates": "我與我的隊友",
+    "A private space just for you": "專為您設計的私人空間",
+    "Just Me": "只有我",
+    "Ensure the right people have access to the space.": "確定適合的人才能存取空間。",
+    "Who are you working with?": "您與誰一起工作？",
+    "Finish": "結束",
+    "At the moment only you can see it.": "目前只有您可以看見它。",
+    "Creating rooms...": "正在建立聊天室……",
+    "Skip for now": "現在跳過",
+    "Failed to create initial space rooms": "建立初始空間聊天室失敗",
+    "Room name": "聊天室名稱",
+    "Support": "支援",
+    "Random": "隨機",
+    "Welcome to <name/>": "歡迎加入 <name/>",
+    "Your private space <name/>": "您的私人空間 <name/>",
+    "Your public space <name/>": "您的公開空間 <name/>",
+    "You have been invited to <name/>": "您被邀請到 <name/>",
+    "<inviter/> invited you to <name/>": "<inviter/> 邀請您到 <name/>",
+    "%(count)s members|one": "%(count)s 位成員",
+    "%(count)s members|other": "%(count)s 位成員",
+    "Your server does not support showing space hierarchies.": "您的伺服器不支援顯示空間的層次結構。",
+    "Default Rooms": "預設聊天室",
+    "Add existing rooms & spaces": "新增既有聊天室與空間",
+    "Accept Invite": "接受邀請",
+    "Find a room...": "尋找聊天室……",
+    "Manage rooms": "管理聊天室",
+    "Promoted to users": "升級為使用者",
+    "Save changes": "儲存變更",
+    "You're in this room": "您在此聊天室中",
+    "You're in this space": "您在此空間中",
+    "No permissions": "無權限",
+    "Remove from Space": "從空間移除",
+    "Undo": "復原",
+    "Your message wasn't sent because this homeserver has been blocked by it's administrator. Please <a>contact your service administrator</a> to continue using the service.": "未傳送您的訊息，因為此家伺服器已被其管理員封鎖。請<a>聯絡您的服務管理員</a>以繼續使用服務。",
+    "Are you sure you want to leave the space '%(spaceName)s'?": "您確定您要離開空間「%(spaceName)s」？",
+    "This space is not public. You will not be able to rejoin without an invite.": "此空間並非公開。在無邀請的情況下，您將無法重新加入。",
+    "Start audio stream": "開始音訊串流",
+    "Failed to start livestream": "開始直播串流失敗",
+    "Unable to start audio streaming.": "無法開始音訊串流。",
+    "Save Changes": "儲存變更",
+    "Saving...": "正在儲存……",
+    "View dev tools": "檢視開發者工具",
+    "Leave Space": "離開空間",
+    "Make this space private": "將此空間設為私人",
+    "Edit settings relating to your space.": "編輯關於您空間的設定。",
+    "Space settings": "空間設定",
+    "Failed to save space settings.": "無法儲存空間設定。",
+    "Invite someone using their name, username (like <userId/>) or <a>share this space</a>.": "使用某人的名字、使用者名稱（如 <userId/>）邀請他們，或<a>分享此空間</a>。",
+    "Invite someone using their name, email address, username (like <userId/>) or <a>share this space</a>.": "使用某人的名字、電子郵件地址、使用者名稱（如 <userId/>）邀請他們，或<a>分享此空間</a>。",
+    "Unnamed Space": "未命名空間",
+    "Invite to %(spaceName)s": "邀請至 %(spaceName)s",
+    "Failed to add rooms to space": "新增聊天室到空間失敗",
+    "Apply": "套用",
+    "Applying...": "正在套用……",
+    "Create a new room": "建立新聊天室",
+    "Don't want to add an existing room?": "不想新增既有的聊天室？",
+    "Spaces": "空間",
+    "Filter your rooms and spaces": "過濾您的聊天室與空間",
+    "Add existing spaces/rooms": "新增既有空間／聊天室",
+    "Space selection": "空間選取",
+    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the space it will be impossible to regain privileges.": "如果您將自己降級，您將無法撤銷此變更，而且如果您是空間中的最後一個高權限使用者，將無法再取得這類權限。",
+    "Empty room": "空聊天室",
+    "Suggested Rooms": "建議的聊天室",
+    "Explore space rooms": "探索空間聊天室",
+    "You do not have permissions to add rooms to this space": "您無權在此空間中新增聊天室",
+    "Add existing room": "新增既有的聊天室",
+    "You do not have permissions to create new rooms in this space": "您無權在此空間中建立新聊天室",
+    "Send message": "傳送訊息",
+    "Invite to this space": "邀請至此空間",
+    "Your message was sent": "您的訊息已傳送",
+    "Encrypting your message...": "正在加密的您訊息……",
+    "Sending your message...": "正在傳送您的訊息……",
+    "Spell check dictionaries": "拼字檢查字典",
+    "Space options": "空間選項",
+    "Space Home": "空間首頁",
+    "New room": "新聊天室",
+    "Leave space": "離開空間",
+    "Invite people": "邀請夥伴",
+    "Share your public space": "分享您的公開空間",
+    "Invite members": "邀請成員",
+    "Invite by email or username": "透過電子郵件或使用者名稱邀請",
+    "Share invite link": "分享邀請連結",
+    "Click to copy": "點擊複製",
+    "Collapse space panel": "折疊空間面板",
+    "Expand space panel": "展開空間面板",
+    "Creating...": "正在建立……",
+    "You can change these at any point.": "您隨時可以更改它們。",
+    "Give it a photo, name and description to help you identify it.": "給它一張照片、名字與描述來協助您識別它。",
+    "Your private space": "您的私人空間",
+    "Your public space": "您的公開空間",
+    "You can change this later": "您之後仍可變更",
+    "Invite only, best for yourself or teams": "僅邀請，最適合您自己或團隊",
+    "Private": "私人",
+    "Open space for anyone, best for communities": "對所有人開放的空間，最適合社群",
+    "Public": "公開",
+    "Spaces are new ways to group rooms and people. To join an existing space you’ll need an invite": "空間是將聊天室與人們分組的新方法。要加入既有的空間，您需要邀請",
+    "Create a space": "建立空間",
+    "Delete": "刪除",
+    "Jump to the bottom of the timeline when you send a message": "傳送訊息時，跳到時間軸底部",
+    "Spaces prototype. Incompatible with Communities, Communities v2 and Custom Tags. Requires compatible homeserver for some features.": "空間原型。與社群、社群 v2 以及自訂標籤不相容。需要相容的家伺服器才能使用某些功能。",
+    "This homeserver has been blocked by it's administrator.": "此家伺服器已被其管理員封鎖。",
+    "This homeserver has been blocked by its administrator.": "此家伺服器已被其管理員封鎖。",
+    "You're already in a call with this person.": "您已與此人通話。",
+    "Already in call": "已在通話中"
 }

From dafa8786a1e17b7238a07c058b5e2be10131b32d Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 16 Mar 2021 23:01:37 -0600
Subject: [PATCH 315/420] Fix comments

---
 src/components/views/rooms/VoiceRecordComposerTile.tsx | 8 ++++----
 src/index.js                                           | 2 --
 src/voice/VoiceRecorder.ts                             | 4 ++--
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/components/views/rooms/VoiceRecordComposerTile.tsx b/src/components/views/rooms/VoiceRecordComposerTile.tsx
index 9ba3764524..d15328eb5a 100644
--- a/src/components/views/rooms/VoiceRecordComposerTile.tsx
+++ b/src/components/views/rooms/VoiceRecordComposerTile.tsx
@@ -55,10 +55,10 @@ export default class VoiceRecordComposerTile extends React.PureComponent<IProps,
         const recorder = new VoiceRecorder(MatrixClientPeg.get());
         await recorder.start();
         this.props.onRecording(true);
-        // TODO: Run through EQ component
-        recorder.rawData.onUpdate((frame) => {
-            console.log('@@ FRAME', frame);
-        });
+        // TODO: @@ TravisR: Run through EQ component
+        // recorder.rawData.onUpdate((frame) => {
+        //     console.log('@@ FRAME', frame);
+        // });
         this.setState({recorder});
     };
 
diff --git a/src/index.js b/src/index.js
index 1ef760dab9..008e15ad90 100644
--- a/src/index.js
+++ b/src/index.js
@@ -28,5 +28,3 @@ export function resetSkin() {
 export function getComponent(componentName) {
     return Skinner.getComponent(componentName);
 }
-
-import "./voice/VoiceRecorder"; // TODO: @@ REMOVE
diff --git a/src/voice/VoiceRecorder.ts b/src/voice/VoiceRecorder.ts
index df6621d00b..e968627fe3 100644
--- a/src/voice/VoiceRecorder.ts
+++ b/src/voice/VoiceRecorder.ts
@@ -39,7 +39,7 @@ export class VoiceRecorder {
 
     public constructor(private client: MatrixClient) {
         this.recorder.ondataavailable = (a: ArrayBuffer) => {
-            // TODO: @@ We'll have to decode each frame and convert it to an EQ to observe
+            // TODO: @@ TravisR: We'll have to decode each frame and convert it to an EQ to observe
             console.log(a);
             const buf = new Uint8Array(a);
             const newBuf = new Uint8Array(this.buffer.length + buf.length);
@@ -111,7 +111,7 @@ export class VoiceRecorder {
         return this.mxc;
     }
 
-    // TODO: @@ REMOVE
+    // TODO: @@ TravisR: REMOVE
     public async test() {
         this.start()
             .then(() => sleep(5000))

From 9aa5348c7fd059ffc1e32f3821e04b5b0ea7345e Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 16 Mar 2021 23:43:59 -0600
Subject: [PATCH 316/420] Show a stop button to stop the recording

---
 res/css/_components.scss                      |  5 +--
 .../views/rooms/_VoiceRecordComposerTile.scss | 36 +++++++++++++++++++
 .../legacy-light/css/_legacy-light.scss       |  3 ++
 res/themes/light/css/_light.scss              |  3 ++
 .../views/rooms/VoiceRecordComposerTile.tsx   | 20 +++++++++--
 src/i18n/strings/en_EN.json                   |  1 +
 src/voice/VoiceRecorder.ts                    |  2 +-
 7 files changed, 64 insertions(+), 6 deletions(-)
 create mode 100644 res/css/views/rooms/_VoiceRecordComposerTile.scss

diff --git a/res/css/_components.scss b/res/css/_components.scss
index d894688cac..9c895490b3 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -111,8 +111,8 @@
 @import "./views/elements/_AddressSelector.scss";
 @import "./views/elements/_AddressTile.scss";
 @import "./views/elements/_DesktopBuildsNotice.scss";
-@import "./views/elements/_DirectorySearchBox.scss";
 @import "./views/elements/_DesktopCapturerSourcePicker.scss";
+@import "./views/elements/_DirectorySearchBox.scss";
 @import "./views/elements/_Dropdown.scss";
 @import "./views/elements/_EditableItemList.scss";
 @import "./views/elements/_ErrorBoundary.scss";
@@ -211,13 +211,13 @@
 @import "./views/rooms/_SendMessageComposer.scss";
 @import "./views/rooms/_Stickers.scss";
 @import "./views/rooms/_TopUnreadMessagesBar.scss";
+@import "./views/rooms/_VoiceRecordComposerTile.scss";
 @import "./views/rooms/_WhoIsTypingTile.scss";
 @import "./views/settings/_AvatarSetting.scss";
 @import "./views/settings/_CrossSigningPanel.scss";
 @import "./views/settings/_DevicesPanel.scss";
 @import "./views/settings/_E2eAdvancedPanel.scss";
 @import "./views/settings/_EmailAddresses.scss";
-@import "./views/settings/_SpellCheckLanguages.scss";
 @import "./views/settings/_IntegrationManager.scss";
 @import "./views/settings/_Notifications.scss";
 @import "./views/settings/_PhoneNumbers.scss";
@@ -225,6 +225,7 @@
 @import "./views/settings/_SecureBackupPanel.scss";
 @import "./views/settings/_SetIdServer.scss";
 @import "./views/settings/_SetIntegrationManager.scss";
+@import "./views/settings/_SpellCheckLanguages.scss";
 @import "./views/settings/_UpdateCheckButton.scss";
 @import "./views/settings/tabs/_SettingsTab.scss";
 @import "./views/settings/tabs/room/_GeneralRoomSettingsTab.scss";
diff --git a/res/css/views/rooms/_VoiceRecordComposerTile.scss b/res/css/views/rooms/_VoiceRecordComposerTile.scss
new file mode 100644
index 0000000000..469a3de66a
--- /dev/null
+++ b/res/css/views/rooms/_VoiceRecordComposerTile.scss
@@ -0,0 +1,36 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.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_VoiceRecordComposerTile_stop {
+    // 28px plus a 2px border makes this a 32px square (as intended)
+    width: 28px;
+    height: 28px;
+    border: 2px solid $voice-record-stop-border-color;
+    border-radius: 32px;
+    margin-right: 16px; // between us and the send button
+    position: relative;
+
+    &::after {
+        content: '';
+        width: 14px;
+        height: 14px;
+        position: absolute;
+        top: 6px;
+        left: 6px;
+        border-radius: 2px;
+        background-color: $voice-record-stop-symbol-color;
+    }
+}
diff --git a/res/themes/legacy-light/css/_legacy-light.scss b/res/themes/legacy-light/css/_legacy-light.scss
index 9ad154dd93..d7ee496d80 100644
--- a/res/themes/legacy-light/css/_legacy-light.scss
+++ b/res/themes/legacy-light/css/_legacy-light.scss
@@ -189,6 +189,9 @@ $roomsublist-skeleton-ui-bg: linear-gradient(180deg, #ffffff 0%, #ffffff00 100%)
 $groupFilterPanel-divider-color: $roomlist-header-color;
 $space-button-outline-color: #E3E8F0;
 
+$voice-record-stop-border-color: #E3E8F0;
+$voice-record-stop-symbol-color: $warning-color;
+
 $roomtile-preview-color: #9e9e9e;
 $roomtile-default-badge-bg-color: #61708b;
 $roomtile-selected-bg-color: #fff;
diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss
index 25fbd0201b..577204ef0c 100644
--- a/res/themes/light/css/_light.scss
+++ b/res/themes/light/css/_light.scss
@@ -180,6 +180,9 @@ $roomsublist-skeleton-ui-bg: linear-gradient(180deg, #ffffff 0%, #ffffff00 100%)
 $groupFilterPanel-divider-color: $roomlist-header-color;
 $space-button-outline-color: #E3E8F0;
 
+$voice-record-stop-border-color: #E3E8F0;
+$voice-record-stop-symbol-color: $warning-color;
+
 $roomtile-preview-color: $secondary-fg-color;
 $roomtile-default-badge-bg-color: #61708b;
 $roomtile-selected-bg-color: #FFF;
diff --git a/src/components/views/rooms/VoiceRecordComposerTile.tsx b/src/components/views/rooms/VoiceRecordComposerTile.tsx
index d15328eb5a..3b31075de2 100644
--- a/src/components/views/rooms/VoiceRecordComposerTile.tsx
+++ b/src/components/views/rooms/VoiceRecordComposerTile.tsx
@@ -20,6 +20,7 @@ import React from "react";
 import {VoiceRecorder} from "../../../voice/VoiceRecorder";
 import {Room} from "matrix-js-sdk/src/models/room";
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
+import classNames from "classnames";
 
 interface IProps {
     room: Room;
@@ -40,12 +41,13 @@ export default class VoiceRecordComposerTile extends React.PureComponent<IProps,
     }
 
     private onStartVoiceMessage = async () => {
+        // TODO: @@ TravisR: We do not want to auto-send on stop.
         if (this.state.recorder) {
             await this.state.recorder.stop();
             const mxc = await this.state.recorder.upload();
             MatrixClientPeg.get().sendMessage(this.props.room.roomId, {
                 body: "Voice message",
-                msgtype: "m.audio", // TODO
+                msgtype: "m.audio", // TODO @@
                 url: mxc,
             });
             this.setState({recorder: null});
@@ -63,11 +65,23 @@ export default class VoiceRecordComposerTile extends React.PureComponent<IProps,
     };
 
     public render() {
+        const classes = classNames({
+            'mx_MessageComposer_button': !this.state.recorder,
+            'mx_MessageComposer_voiceMessage': !this.state.recorder,
+            'mx_VoiceRecordComposerTile_stop': !!this.state.recorder,
+        });
+
+        let tooltip = _t("Record a voice message");
+        if (!!this.state.recorder) {
+            // TODO: @@ TravisR: Change to match behaviour
+            tooltip = _t("Stop & send recording");
+        }
+
         return (
             <AccessibleTooltipButton
-                className="mx_MessageComposer_button mx_MessageComposer_voiceMessage"
+                className={classes}
                 onClick={this.onStartVoiceMessage}
-                title={_t('Record a voice message')}
+                title={tooltip}
             />
         );
     }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 4654cb1f99..74100ed4b0 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1637,6 +1637,7 @@
     "Jump to first unread message.": "Jump to first unread message.",
     "Mark all as read": "Mark all as read",
     "Record a voice message": "Record a voice message",
+    "Stop & send recording": "Stop & send recording",
     "Error updating main address": "Error updating main address",
     "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.",
     "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.",
diff --git a/src/voice/VoiceRecorder.ts b/src/voice/VoiceRecorder.ts
index e968627fe3..1e59e451bd 100644
--- a/src/voice/VoiceRecorder.ts
+++ b/src/voice/VoiceRecorder.ts
@@ -119,7 +119,7 @@ export class VoiceRecorder {
             .then(() => this.upload())
             .then(() => this.client.sendMessage("!HKjSnKDluFnCCnjayl:localhost", {
                 body: "Voice message",
-                msgtype: "m.audio", // TODO
+                msgtype: "m.audio", // TODO @@
                 url: this.mxc,
             }));
     }

From 1dc2427128910a9e6cd5355758153490b62b778a Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 16 Mar 2021 23:44:39 -0600
Subject: [PATCH 317/420] Remove test function

---
 src/voice/VoiceRecorder.ts | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/src/voice/VoiceRecorder.ts b/src/voice/VoiceRecorder.ts
index 1e59e451bd..9080c35b91 100644
--- a/src/voice/VoiceRecorder.ts
+++ b/src/voice/VoiceRecorder.ts
@@ -18,7 +18,6 @@ import * as Recorder from 'opus-recorder';
 import encoderPath from 'opus-recorder/dist/encoderWorker.min.js';
 import {MatrixClient} from "matrix-js-sdk/src/client";
 import CallMediaHandler from "../CallMediaHandler";
-import {sleep} from "../utils/promise";
 import {SimpleObservable} from "matrix-widget-api";
 
 export class VoiceRecorder {
@@ -110,19 +109,6 @@ export class VoiceRecorder {
         }).then(r => r['content_uri']);
         return this.mxc;
     }
-
-    // TODO: @@ TravisR: REMOVE
-    public async test() {
-        this.start()
-            .then(() => sleep(5000))
-            .then(() => this.stop())
-            .then(() => this.upload())
-            .then(() => this.client.sendMessage("!HKjSnKDluFnCCnjayl:localhost", {
-                body: "Voice message",
-                msgtype: "m.audio", // TODO @@
-                url: this.mxc,
-            }));
-    }
 }
 
 window.mxVoiceRecorder = VoiceRecorder;

From f0d5edbc37b20e1421c4471617e0946a03b7fbbf Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 16 Mar 2021 23:48:47 -0600
Subject: [PATCH 318/420] Render voice messages as audio messages for now

---
 src/components/views/messages/MessageEvent.js          | 4 ++++
 src/components/views/rooms/VoiceRecordComposerTile.tsx | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/views/messages/MessageEvent.js b/src/components/views/messages/MessageEvent.js
index 866e0f521d..28c2f8f9b9 100644
--- a/src/components/views/messages/MessageEvent.js
+++ b/src/components/views/messages/MessageEvent.js
@@ -71,6 +71,10 @@ export default class MessageEvent extends React.Component {
             'm.file': sdk.getComponent('messages.MFileBody'),
             'm.audio': sdk.getComponent('messages.MAudioBody'),
             'm.video': sdk.getComponent('messages.MVideoBody'),
+
+            // TODO: @@ TravisR: Use labs flag determination.
+            // MSC: https://github.com/matrix-org/matrix-doc/pull/2516
+            'org.matrix.msc2516.voice': sdk.getComponent('messages.MAudioBody'),
         };
         const evTypes = {
             'm.sticker': sdk.getComponent('messages.MStickerBody'),
diff --git a/src/components/views/rooms/VoiceRecordComposerTile.tsx b/src/components/views/rooms/VoiceRecordComposerTile.tsx
index 3b31075de2..a1d0e8c12f 100644
--- a/src/components/views/rooms/VoiceRecordComposerTile.tsx
+++ b/src/components/views/rooms/VoiceRecordComposerTile.tsx
@@ -47,7 +47,7 @@ export default class VoiceRecordComposerTile extends React.PureComponent<IProps,
             const mxc = await this.state.recorder.upload();
             MatrixClientPeg.get().sendMessage(this.props.room.roomId, {
                 body: "Voice message",
-                msgtype: "m.audio", // TODO @@
+                msgtype: "org.matrix.msc2516.voice",
                 url: mxc,
             });
             this.setState({recorder: null});

From 6c566cd38241fb273cb58934711205bdd70d2e34 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 16 Mar 2021 23:50:03 -0600
Subject: [PATCH 319/420] Remove debugging

---
 src/voice/VoiceRecorder.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/voice/VoiceRecorder.ts b/src/voice/VoiceRecorder.ts
index 9080c35b91..66eb64b424 100644
--- a/src/voice/VoiceRecorder.ts
+++ b/src/voice/VoiceRecorder.ts
@@ -39,7 +39,6 @@ export class VoiceRecorder {
     public constructor(private client: MatrixClient) {
         this.recorder.ondataavailable = (a: ArrayBuffer) => {
             // TODO: @@ TravisR: We'll have to decode each frame and convert it to an EQ to observe
-            console.log(a);
             const buf = new Uint8Array(a);
             const newBuf = new Uint8Array(this.buffer.length + buf.length);
             newBuf.set(this.buffer, 0);

From 51dca8d13d670c8fe9bfe5676f8726d0210bc5ac Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 16 Mar 2021 23:54:33 -0600
Subject: [PATCH 320/420] Fix positioning of stop square

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

diff --git a/res/css/views/rooms/_VoiceRecordComposerTile.scss b/res/css/views/rooms/_VoiceRecordComposerTile.scss
index 469a3de66a..bb36991b4f 100644
--- a/res/css/views/rooms/_VoiceRecordComposerTile.scss
+++ b/res/css/views/rooms/_VoiceRecordComposerTile.scss
@@ -28,8 +28,8 @@ limitations under the License.
         width: 14px;
         height: 14px;
         position: absolute;
-        top: 6px;
-        left: 6px;
+        top: 7px;
+        left: 7px;
         border-radius: 2px;
         background-color: $voice-record-stop-symbol-color;
     }

From 69f90ee97eef64af7b23a8b91d1c53536b810012 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 16 Mar 2021 23:55:07 -0600
Subject: [PATCH 321/420] Label labs flag as in development

---
 src/i18n/strings/en_EN.json | 2 +-
 src/settings/Settings.ts    | 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 74100ed4b0..625a2e7334 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -783,7 +783,7 @@
     "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s",
     "Change notification settings": "Change notification settings",
     "Spaces prototype. Incompatible with Communities, Communities v2 and Custom Tags. Requires compatible homeserver for some features.": "Spaces prototype. Incompatible with Communities, Communities v2 and Custom Tags. Requires compatible homeserver for some features.",
-    "Send and receive voice messages": "Send and receive voice messages",
+    "Send and receive voice messages (in development)": "Send and receive voice messages (in development)",
     "Render LaTeX maths in messages": "Render LaTeX maths in messages",
     "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.": "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.",
     "New spinner design": "New spinner design",
diff --git a/src/settings/Settings.ts b/src/settings/Settings.ts
index b718ddd8d2..b38dee6e1a 100644
--- a/src/settings/Settings.ts
+++ b/src/settings/Settings.ts
@@ -130,7 +130,7 @@ export const SETTINGS: {[setting: string]: ISetting} = {
     },
     "feature_voice_messages": {
         isFeature: true,
-        displayName: _td("Send and receive voice messages"),
+        displayName: _td("Send and receive voice messages (in development)"),
         supportedLevels: LEVELS_FEATURE,
         default: false,
     },

From c7b72bc4c43c26b438f4a5de07a8ecaea2a0a390 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 16 Mar 2021 23:57:27 -0600
Subject: [PATCH 322/420] Appease the linter

---
 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 2efda53bc2..13f934c626 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -354,7 +354,7 @@ export default class MessageComposer extends React.Component {
                     onChange={this.onChange}
                     // TODO: TravisR - Disabling the composer doesn't work
                     disabled={this.state.haveRecording}
-                />
+                />,
             );
 
             if (!this.state.haveRecording) {

From 0f09eb3214984ceb256c30e3c222033edd8854c6 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 17 Mar 2021 00:09:56 -0600
Subject: [PATCH 323/420] Add more notes

---
 src/components/views/rooms/BasicMessageComposer.tsx | 2 ++
 src/components/views/rooms/MessageComposer.js       | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/views/rooms/BasicMessageComposer.tsx b/src/components/views/rooms/BasicMessageComposer.tsx
index 223a7a5395..1a95b4366a 100644
--- a/src/components/views/rooms/BasicMessageComposer.tsx
+++ b/src/components/views/rooms/BasicMessageComposer.tsx
@@ -673,6 +673,8 @@ export default class BasicMessageEditor extends React.Component<IProps, IState>
         });
         const classes = classNames("mx_BasicMessageComposer_input", {
             "mx_BasicMessageComposer_input_shouldShowPillAvatar": this.state.showPillAvatar,
+
+            // TODO: @@ TravisR: This doesn't work properly. The composer resets in a strange way.
             "mx_BasicMessageComposer_input_disabled": this.props.disabled,
         });
 
diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 13f934c626..b7078766fb 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -352,7 +352,7 @@ export default class MessageComposer extends React.Component {
                     permalinkCreator={this.props.permalinkCreator}
                     replyToEvent={this.props.replyToEvent}
                     onChange={this.onChange}
-                    // TODO: TravisR - Disabling the composer doesn't work
+                    // TODO: @@ TravisR - Disabling the composer doesn't work
                     disabled={this.state.haveRecording}
                 />,
             );

From f6a87386bc2f0b15892920dd19d85820b9eeb647 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 17 Mar 2021 19:09:43 +0000
Subject: [PATCH 324/420] Fix username showing instead of display name in Jitsi
 widgets

If you opened element and entered a jitsi conference straight away
in the room you landed in, your jitsi display name would be your
matrix username rather than your display name. This was because
OwnProfileStore was still busy fetching your profile from the server
while the room, and therefore jitsi widget, was rendered.

Blocking these widgets loading on this profile fetch completing isn't
really an option, so store the profile data in localstorage and seed
OwnProfileStore with the values from there.

Bonus: the name in the top left will now be your display name as
soon as the app is loaded, rather than being your username for the
first several seconds after you load the app.

Fixes https://github.com/vector-im/element-web/issues/16577
---
 src/stores/OwnProfileStore.ts | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/stores/OwnProfileStore.ts b/src/stores/OwnProfileStore.ts
index 8983380fec..15884b8ad6 100644
--- a/src/stores/OwnProfileStore.ts
+++ b/src/stores/OwnProfileStore.ts
@@ -28,13 +28,22 @@ interface IState {
     avatarUrl?: string;
 }
 
+const KEY_DISPLAY_NAME = "mx_profile_displayname";
+const KEY_AVATAR_URL = "mx_profile_avatar_url";
+
 export class OwnProfileStore extends AsyncStoreWithClient<IState> {
     private static internalInstance = new OwnProfileStore();
 
     private monitoredUser: User;
 
     private constructor() {
-        super(defaultDispatcher, {});
+        // seed from localstorage because otherwise we won't get these values until a whole network
+        // round-trip after the client is ready, and we often load widgets in that time, and we'd
+        // and up passing them an incorrect display name
+        super(defaultDispatcher, {
+            displayName: window.localStorage.getItem(KEY_DISPLAY_NAME),
+            avatarUrl: window.localStorage.getItem(KEY_AVATAR_URL),
+        });
     }
 
     public static get instance(): OwnProfileStore {
@@ -73,7 +82,11 @@ export class OwnProfileStore extends AsyncStoreWithClient<IState> {
     public getHttpAvatarUrl(size = 0): string {
         if (!this.avatarMxc) return null;
         const adjustedSize = size > 1 ? size : undefined; // don't let negatives or zero through
-        return this.matrixClient.mxcUrlToHttp(this.avatarMxc, adjustedSize, adjustedSize);
+
+        // XXX: We use MatrixClientPeg here rather than this.matrixClient because otherwise we'll
+        // race because our data stores aren't set up consistently enough that this will all be
+        // initialised with a store before these getter methods are called.
+        return MatrixClientPeg.get().mxcUrlToHttp(this.avatarMxc, adjustedSize, adjustedSize);
     }
 
     protected async onNotReady() {
@@ -110,6 +123,8 @@ export class OwnProfileStore extends AsyncStoreWithClient<IState> {
         // We specifically do not use the User object we stored for profile info as it
         // could easily be wrong (such as per-room instead of global profile).
         const profileInfo = await this.matrixClient.getProfileInfo(this.matrixClient.getUserId());
+        if (profileInfo.displayname) window.localStorage.setItem(KEY_DISPLAY_NAME, profileInfo.displayname);
+        if (profileInfo.avatar_url) window.localStorage.setItem(KEY_AVATAR_URL, profileInfo.avatar_url);
         await this.updateState({displayName: profileInfo.displayname, avatarUrl: profileInfo.avatar_url});
     };
 

From 2b608aa919eaa82827a4372ffa1e9dbf6a609f45 Mon Sep 17 00:00:00 2001
From: David Baker <dbkr@users.noreply.github.com>
Date: Wed, 17 Mar 2021 19:18:32 +0000
Subject: [PATCH 325/420] Remove blank line

---
 src/stores/OwnProfileStore.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/stores/OwnProfileStore.ts b/src/stores/OwnProfileStore.ts
index 6927ecc153..398532a5c8 100644
--- a/src/stores/OwnProfileStore.ts
+++ b/src/stores/OwnProfileStore.ts
@@ -82,7 +82,6 @@ export class OwnProfileStore extends AsyncStoreWithClient<IState> {
      */
     public getHttpAvatarUrl(size = 0): string {
         if (!this.avatarMxc) return null;
-
         const media = mediaFromMxc(this.avatarMxc);
         if (!size || size <= 0) {
             return media.srcHttp;

From 84b6027d41e055e342653fab3e5198b37e96396e Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 18 Mar 2021 16:41:22 +0000
Subject: [PATCH 326/420] Log error when failing to list usermedia devices

So we can debug why this might be failing
---
 src/components/views/settings/tabs/user/VoiceUserSettingsTab.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/views/settings/tabs/user/VoiceUserSettingsTab.js b/src/components/views/settings/tabs/user/VoiceUserSettingsTab.js
index bc6fe796b8..d8adab55f6 100644
--- a/src/components/views/settings/tabs/user/VoiceUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/VoiceUserSettingsTab.js
@@ -84,6 +84,7 @@ export default class VoiceUserSettingsTab extends React.Component {
             }
         }
         if (error) {
+            console.log("Failed to list userMedia devices", error);
             const brand = SdkConfig.get().brand;
             const ErrorDialog = sdk.getComponent('dialogs.ErrorDialog');
             Modal.createTrackedDialog('No media permissions', '', ErrorDialog, {

From a4a3b4da78d6562e8d1f11e91fe58c8b6d58945c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Thu, 18 Mar 2021 18:01:50 +0100
Subject: [PATCH 327/420] jumpToLiveTimeline() on scroll_to_bottom
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 src/components/structures/TimelinePanel.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index f32b8ed0a9..84193eae4c 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -463,6 +463,9 @@ class TimelinePanel extends React.Component {
                 }
             });
         }
+        if (payload.action === "scroll_to_bottom") {
+            this.jumpToLiveTimeline();
+        }
     };
 
     onRoomTimeline = (ev, room, toStartOfTimeline, removed, data) => {

From 7ac8fdea6448bd5e1a386fec2ae2fb412b69d689 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Thu, 18 Mar 2021 18:02:33 +0100
Subject: [PATCH 328/420] Don't call scrollToBottom() on scroll_to_bottom()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 src/components/structures/MessagePanel.js | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 439bdbcef5..f4334ffe87 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -23,7 +23,6 @@ import classNames from 'classnames';
 import shouldHideEvent from '../../shouldHideEvent';
 import {wantsDateSeparator} from '../../DateUtils';
 import * as sdk from '../../index';
-import dis from "../../dispatcher/dispatcher";
 
 import {MatrixClientPeg} from '../../MatrixClientPeg';
 import SettingsStore from '../../settings/SettingsStore';
@@ -210,13 +209,11 @@ export default class MessagePanel extends React.Component {
 
     componentDidMount() {
         this._isMounted = true;
-        this.dispatcherRef = dis.register(this.onAction);
     }
 
     componentWillUnmount() {
         this._isMounted = false;
         SettingsStore.unwatchSetting(this._showTypingNotificationsWatcherRef);
-        dis.unregister(this.dispatcherRef);
     }
 
     componentDidUpdate(prevProps, prevState) {
@@ -229,14 +226,6 @@ export default class MessagePanel extends React.Component {
         }
     }
 
-    onAction = (payload) => {
-        switch (payload.action) {
-            case "scroll_to_bottom":
-                this.scrollToBottom();
-                break;
-        }
-    }
-
     onShowTypingNotificationsChange = () => {
         this.setState({
             showTypingNotifications: SettingsStore.getValue("showTypingNotifications"),

From c848499f9fc7f83f564d9038c45a77325fe3eccd Mon Sep 17 00:00:00 2001
From: Sven Grewe <svengrewe@posteo.de>
Date: Tue, 16 Mar 2021 13:56:23 +0000
Subject: [PATCH 329/420] Translated using Weblate (German)

Currently translated at 96.7% (2795 of 2889 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
---
 src/i18n/strings/de_DE.json | 206 ++++++++++++++++++------------------
 1 file changed, 103 insertions(+), 103 deletions(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 18872070c9..a8b2ac7878 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -13,7 +13,7 @@
     "Session ID": "Sitzungs-ID",
     "Displays action": "Zeigt Aktionen an",
     "Bans user with given id": "Verbannt den Benutzer mit der angegebenen ID",
-    "Deops user with given id": "Setzt das Berechtigungslevel des/der Benutzer:in mit der angegebenen ID zurück",
+    "Deops user with given id": "Setzt das Berechtigungslevel beim Benutzer mit der angegebenen ID zurück",
     "Invites user with given id to current room": "Lädt den Benutzer mit der angegebenen ID in den aktuellen Raum ein",
     "Kicks user with given id": "Benutzer mit der angegebenen ID kicken",
     "Changes your display nickname": "Ändert deinen Anzeigenamen",
@@ -59,13 +59,13 @@
     "Moderator": "Moderator",
     "Notifications": "Benachrichtigungen",
     "<not supported>": "<nicht unterstützt>",
-    "No users have specific privileges in this room": "Keine Nutzer:innen haben in diesem Raum privilegierte Berechtigungen",
+    "No users have specific privileges in this room": "Keine Nutzer haben in diesem Raum privilegierte Berechtigungen",
     "Only people who have been invited": "Eingeladene Personen",
     "Password": "Passwort",
     "Permissions": "Berechtigungen",
     "Phone": "Telefon",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Bitte prüfe deinen E-Mail-Posteingang und klicke auf den in der E-Mail enthaltenen Link. Anschließend auf \"Fortsetzen\" klicken.",
-    "Privileged Users": "Privilegierte Nutzer:innen",
+    "Privileged Users": "Privilegierte Benutzer",
     "Profile": "Profil",
     "Reject invitation": "Einladung ablehnen",
     "Remove": "Entfernen",
@@ -89,7 +89,7 @@
     "unknown error code": "Unbekannter Fehlercode",
     "Upload avatar": "Profilbild hochladen",
     "Upload file": "Datei hochladen",
-    "Users": "Nutzer:innen",
+    "Users": "Benutzer",
     "Verification Pending": "Verifizierung ausstehend",
     "Video call": "Videoanruf",
     "Voice call": "Sprachanruf",
@@ -228,7 +228,7 @@
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Es wurde versucht, einen bestimmten Punkt im Chatverlauf dieses Raumes zu laden, der Punkt konnte jedoch nicht gefunden werden.",
     "You seem to be in a call, are you sure you want to quit?": "Du scheinst in einem Gespräch zu sein, bist du sicher, dass du aufhören willst?",
     "You seem to be uploading files, are you sure you want to quit?": "Du scheinst Dateien hochzuladen. Bist du sicher schließen zu wollen?",
-    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Du wirst diese Änderung nicht rückgängig machen können, da der/die Nutzer!n dasselbe Berechtigungsstufe wie du selbst erhalten wird.",
+    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Du kannst diese Änderung nicht rückgängig machen, da der Nutzer dieselbe Berechtigungsstufe wie du selbst erhalten wird.",
     "Room": "Raum",
     "Cancel": "Abbrechen",
     "Click to unmute video": "Klicken, um die Video-Stummschaltung zu deaktivieren",
@@ -390,7 +390,7 @@
     "Add a widget": "Widget hinzufügen",
     "Allow": "Erlauben",
     "Delete widget": "Widget entfernen",
-    "Define the power level of a user": "Berechtigungsstufe einer/s Benutzer:in setzen",
+    "Define the power level of a user": "Berechtigungsstufe einers Benutzers setzen",
     "Edit": "Bearbeiten",
     "Enable automatic language detection for syntax highlighting": "Automatische Spracherkennung für die Syntax-Hervorhebung aktivieren",
     "To get started, please pick a username!": "Um zu starten, wähle bitte einen Nutzernamen!",
@@ -416,31 +416,31 @@
     "You are now ignoring %(userId)s": "%(userId)s wird jetzt ignoriert",
     "You are no longer ignoring %(userId)s": "%(userId)s wird nicht mehr ignoriert",
     "Leave": "Verlassen",
-    "Failed to invite the following users to %(groupId)s:": "Die folgenden Benutzer:innen konnten nicht in die Gruppe %(groupId)s eingeladen werden:",
+    "Failed to invite the following users to %(groupId)s:": "Die folgenden Benutzer konnten nicht in die Gruppe %(groupId)s eingeladen werden:",
     "Leave %(groupName)s?": "%(groupName)s verlassen?",
     "Add a Room": "Raum hinzufügen",
-    "Add a User": "Benutzer:in hinzufügen",
+    "Add a User": "Benutzer hinzufügen",
     "You have entered an invalid address.": "Du hast eine ungültige Adresse eingegeben.",
     "Matrix ID": "Matrix-ID",
     "Unignore": "Nicht mehr ignorieren",
-    "Unignored user": "Benutzer:in nicht mehr ignoriert",
-    "Ignored user": "Benutzer:in ignoriert",
-    "Stops ignoring a user, showing their messages going forward": "Benutzer:in nicht mehr ignorieren und neue Nachrichten wieder anzeigen",
+    "Unignored user": "Benutzer nicht mehr ignoriert",
+    "Ignored user": "Benutzer ignoriert",
+    "Stops ignoring a user, showing their messages going forward": "Benutzer nicht mehr ignorieren und neue Nachrichten wieder anzeigen",
     "Ignores a user, hiding their messages from you": "Ignoriert einen Benutzer und verbirgt dessen Nachrichten",
     "Banned by %(displayName)s": "Verbannt von %(displayName)s",
     "Description": "Beschreibung",
     "Unable to accept invite": "Einladung kann nicht angenommen werden",
-    "Failed to invite users to %(groupId)s": "Benutzer:innen konnten nicht in %(groupId)s eingeladen werden",
+    "Failed to invite users to %(groupId)s": "Benutzer konnten nicht in %(groupId)s eingeladen werden",
     "Unable to reject invite": "Einladung konnte nicht abgelehnt werden",
     "Who would you like to add to this summary?": "Wen möchtest zu dieser Übersicht hinzufügen?",
     "Add to summary": "Zur Übersicht hinzufügen",
-    "Failed to add the following users to the summary of %(groupId)s:": "Die folgenden Benutzer:innen konnten nicht zur Übersicht von %(groupId)s hinzugefügt werden:",
+    "Failed to add the following users to the summary of %(groupId)s:": "Die folgenden Benutzer konnten nicht zur Übersicht von %(groupId)s hinzugefügt werden:",
     "Which rooms would you like to add to this summary?": "Welche Räume möchtest du zu dieser Übersicht hinzufügen?",
     "Failed to add the following rooms to the summary of %(groupId)s:": "Die folgenden Räume konnten nicht zur Übersicht von %(groupId)s hinzugefügt werden:",
     "Failed to remove the room from the summary of %(groupId)s": "Der Raum konnte nicht aus der Übersicht von %(groupId)s entfernt werden",
     "The room '%(roomName)s' could not be removed from the summary.": "Der Raum '%(roomName)s' konnte nicht aus der Übersicht entfernt werden.",
-    "Failed to remove a user from the summary of %(groupId)s": "Benutzer:in konnte nicht aus der Übersicht von %(groupId)s entfernt werden",
-    "The user '%(displayName)s' could not be removed from the summary.": "Der Benutzer:in '%(displayName)s' konnte nicht aus der Übersicht entfernt werden.",
+    "Failed to remove a user from the summary of %(groupId)s": "Benutzer konnte nicht aus der Übersicht von %(groupId)s entfernt werden",
+    "The user '%(displayName)s' could not be removed from the summary.": "Der Benutzer '%(displayName)s' konnte nicht aus der Übersicht entfernt werden.",
     "Unknown": "Unbekannt",
     "Failed to add the following rooms to %(groupId)s:": "Die folgenden Räume konnten nicht zu %(groupId)s hinzugefügt werden:",
     "Matrix Room ID": "Matrix-Raum-ID",
@@ -469,7 +469,7 @@
     "Which rooms would you like to add to this community?": "Welche Räume sollen zu dieser Community hinzugefügt werden?",
     "Add rooms to the community": "Räume zur Community hinzufügen",
     "Add to community": "Zur Community hinzufügen",
-    "Failed to invite users to community": "Benutzer:innen konnten nicht in die Community eingeladen werden",
+    "Failed to invite users to community": "Benutzer konnten nicht in die Community eingeladen werden",
     "Communities": "Communities",
     "Invalid community ID": "Ungültige Community-ID",
     "'%(groupId)s' is not a valid community ID": "'%(groupId)s' ist keine gültige Community-ID",
@@ -485,26 +485,26 @@
     "Community ID": "Community-ID",
     "example": "Beispiel",
     "Add rooms to the community summary": "Fügt Räume zur Community-Übersicht hinzu",
-    "Add users to the community summary": "Füge Benutzer:innen zur Community-Übersicht hinzu",
+    "Add users to the community summary": "Füge Benutzer zur Community-Übersicht hinzu",
     "Failed to update community": "Aktualisieren der Community fehlgeschlagen",
     "Leave Community": "Community verlassen",
     "Add rooms to this community": "Räume zu dieser Community hinzufügen",
     "%(inviter)s has invited you to join this community": "%(inviter)s hat dich in diese Community eingeladen",
     "You are a member of this community": "Du bist Mitglied dieser Community",
-    "You are an administrator of this community": "Du bist ein:e Administrator:in dieser Community",
+    "You are an administrator of this community": "Du bist ein Administrator dieser Community",
     "Community %(groupId)s not found": "Community '%(groupId)s' nicht gefunden",
     "Failed to load %(groupId)s": "'%(groupId)s' konnte nicht geladen werden",
     "Error whilst fetching joined communities": "Fehler beim Laden beigetretener Communities",
     "Create a new community": "Neue Community erstellen",
     "Your Communities": "Deine Communities",
     "You're not currently a member of any communities.": "Du gehörst aktuell keiner Community an.",
-    "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Erstelle eine Community, um Benutzer:innen und Räume miteinander zu verbinden! Erstelle zusätzlich eine eigene Homepage, um deinen individuellen Bereich im Matrix-Universum zu gestalten.",
+    "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Erstelle eine Community, um Benutzer und Räume miteinander zu verbinden! Erstelle zusätzlich eine eigene Homepage, um deinen individuellen Bereich im Matrix-Universum zu gestalten.",
     "Something went wrong whilst creating your community": "Beim Erstellen deiner Community ist ein Fehler aufgetreten",
     "And %(count)s more...|other": "Und %(count)s weitere...",
     "Delete Widget": "Widget löschen",
     "Mention": "Erwähnen",
     "Invite": "Einladen",
-    "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Das Löschen eines Widgets entfernt es für alle Nutzer:innen in diesem Raum. Möchtest du es wirklich löschen?",
+    "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Das Löschen eines Widgets entfernt es für alle Nutzer in diesem Raum. Möchtest du es wirklich löschen?",
     "Mirror local video feed": "Lokalen Video-Feed spiegeln",
     "Failed to withdraw invitation": "Die Einladung konnte nicht zurückgezogen werden",
     "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Community-IDs dürfen nur die folgenden Zeichen enthalten: a-z, 0-9, or '=_-./'",
@@ -550,17 +550,17 @@
     "%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)shaben das Profilbild geändert",
     "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)shat das Profilbild %(count)s-mal geändert",
     "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)shat das Profilbild geändert",
-    "Disinvite this user?": "Einladung für diese:n Benutzer:in zurückziehen?",
-    "Kick this user?": "Diese:n Benutzer:in kicken?",
-    "Unban this user?": "Verbannung für diese:n Benutzer:in aufheben?",
-    "Ban this user?": "Diese:n Benutzer:in verbannen?",
+    "Disinvite this user?": "Einladung für diesen Benutzer zurückziehen?",
+    "Kick this user?": "Diesen Benutzer kicken?",
+    "Unban this user?": "Verbannung für diesen Benutzer aufheben?",
+    "Ban this user?": "Diesen Benutzer verbannen?",
     "Members only (since the point in time of selecting this option)": "Nur Mitglieder (ab dem Zeitpunkt, an dem diese Option ausgewählt wird)",
     "Members only (since they were invited)": "Nur Mitglieder (ab dem Zeitpunkt, an dem sie eingeladen wurden)",
     "Members only (since they joined)": "Nur Mitglieder (ab dem Zeitpunkt, an dem sie beigetreten sind)",
     "An email has been sent to %(emailAddress)s": "Eine E-Mail wurde an %(emailAddress)s gesendet",
     "A text message has been sent to %(msisdn)s": "Eine Textnachricht wurde an %(msisdn)s gesendet",
-    "Disinvite this user from community?": "Community-Einladung für diese:n Benutzer:in zurückziehen?",
-    "Remove this user from community?": "Diese:n Benutzer:in aus der Community entfernen?",
+    "Disinvite this user from community?": "Community-Einladung für diesen Benutzer zurückziehen?",
+    "Remove this user from community?": "Diesen Benutzer aus der Community entfernen?",
     "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)shaben ihre Einladungen %(count)s-mal abgelehnt",
     "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)shat die Einladung %(count)s-mal abgelehnt",
     "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)shat die Einladung abgelehnt",
@@ -629,7 +629,7 @@
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Ob du den Richtext-Modus des Editors benutzt oder nicht",
     "Your homeserver's URL": "Deine Homeserver-URL",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s. %(monthName)s %(fullYear)s",
-    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Du wirst nicht in der Lage sein, die Änderung zurückzusetzen, da du dich degradierst. Wenn du der/die letze Nutzer:in mit Berechtigungen bist, wird es unmöglich sein die Privilegien zurückzubekommen.",
+    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Du wirst nicht in der Lage sein, die Änderung zurückzusetzen, da du dich degradierst. Wenn du der letze Nutzer mit Berechtigungen bist, wird es unmöglich sein die Privilegien zurückzubekommen.",
     "Community IDs cannot be empty.": "Community-IDs können nicht leer sein.",
     "Learn more about how we use analytics.": "Lerne mehr darüber, wie wir die Analysedaten nutzen.",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Wenn diese Seite identifizierbare Informationen wie Raum-, Nutzer- oder Gruppen-ID enthält, werden diese Daten entfernt bevor sie an den Server gesendet werden.",
@@ -644,7 +644,7 @@
     "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Um einen Filter zu setzen, ziehe ein Community-Bild auf das Filter-Panel ganz links. Du kannst jederzeit auf einen Avatar im Filter-Panel klicken, um nur die Räume und Personen aus der Community zu sehen.",
     "Clear filter": "Filter zurücksetzen",
     "Key request sent.": "Schlüssel-Anfragen gesendet.",
-    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Wenn du einen Fehler via GitHub meldest, können Fehlerberichte uns helfen um das Problem zu finden. Sie enthalten Anwendungsdaten wie deinen Nutzernamen, Raum- und Gruppen-ID's und Aliase die du besucht hast und Nutzernamen anderer Nutzer:innen. Sie enthalten keine Nachrichten.",
+    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Wenn du einen Fehler via GitHub meldest, können Fehlerberichte uns helfen um das Problem zu finden. Sie enthalten Anwendungsdaten wie deinen Nutzernamen, Raum- und Gruppen-ID's und Aliase die du besucht hast und Nutzernamen anderer Nutzer. Sie enthalten keine Nachrichten.",
     "Submit debug logs": "Fehlerberichte einreichen",
     "Code": "Code",
     "Opens the Developer Tools dialog": "Öffnet die Entwickler-Werkzeuge",
@@ -799,17 +799,17 @@
     "Send analytics data": "Analysedaten senden",
     "e.g. %(exampleValue)s": "z.B. %(exampleValue)s",
     "Muted Users": "Stummgeschaltete Benutzer",
-    "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. <b>This action is irreversible.</b>": "Dies wird deinen Account permanent unbenutzbar machen. Du wirst nicht in der Lage sein, dich anzumelden und keiner wird dieselbe Benutzer-ID erneut registrieren können. Alle Räume, in denen der Account ist, werden verlassen und deine Account-Daten werden vom Identitätsserver gelöscht. <b>Diese Aktion ist unumkehrbar.</b>",
-    "Deactivating your account <b>does not by default cause us to forget messages you have sent.</b> If you would like us to forget your messages, please tick the box below.": "Standardmäßig werden <b>die von dir gesendeten Nachrichten beim Deaktiveren nicht gelöscht</b>. Wenn du dies von uns möchtest, aktivere das Auswalfeld unten.",
+    "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. <b>This action is irreversible.</b>": "Dies wird deinen Konto permanent unbenutzbar machen. Du wirst nicht in der Lage sein, dich anzumelden und keiner wird dieselbe Benutzer-ID erneut registrieren können. Alle Räume, in denen der Account ist, werden verlassen und deine Account-Daten werden vom Identitätsserver gelöscht. <b>Diese Aktion ist unumkehrbar.</b>",
+    "Deactivating your account <b>does not by default cause us to forget messages you have sent.</b> If you would like us to forget your messages, please tick the box below.": "Standardmäßig werden <b>die von dir gesendeten Nachrichten beim Deaktiveren nicht gelöscht</b>. Wenn du dies von uns möchtest, aktivere das Auswahlfeld unten.",
     "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Die Sichtbarkeit der Nachrichten in Matrix ist vergleichbar mit E-Mails: Wenn wir deine Nachrichten vergessen heißt das, dass diese nicht mit neuen oder nicht registrierten Nutzern teilen werden, aber registrierte Nutzer, die bereits zugriff haben, werden Zugriff auf ihre Kopie behalten.",
-    "Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)": "Bitte vergesst alle Nachrichten, die ich gesendet habe, wenn mein Account deaktiviert wird. (<b>Warnung:</b> Zukünftige Nutzer:innen werden eine unvollständige Konversation sehen)",
+    "Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)": "Bitte vergesst alle Nachrichten, die ich gesendet habe, wenn mein Konto deaktiviert wird. (<b>Warnung:</b> Zukünftige Nutzer werden eine unvollständige Konversation sehen)",
     "To continue, please enter your password:": "Um fortzufahren, bitte Passwort eingeben:",
     "Can't leave Server Notices room": "Du kannst den Raum für Server-Notizen nicht verlassen",
     "This room is used for important messages from the Homeserver, so you cannot leave it.": "Du kannst diesen Raum nicht verlassen, da dieser Raum für wichtige Nachrichten vom Heimserver verwendet wird.",
     "Terms and Conditions": "Geschäftsbedingungen",
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Um den %(homeserverDomain)s -Heimserver weiter zu verwenden, musst du die Geschäftsbedingungen sichten und ihnen zustimmen.",
     "Review terms and conditions": "Geschäftsbedingungen anzeigen",
-    "Share Link to User": "Link zu Benutzer:in teilen",
+    "Share Link to User": "Link zum Benutzer teilen",
     "Share room": "Raum teilen",
     "Share Room": "Raum teilen",
     "Link to most recent message": "Link zur aktuellsten Nachricht",
@@ -828,7 +828,7 @@
     "The password field must not be blank.": "Das Passwort-Feld darf nicht leer sein.",
     "Call in Progress": "Gespräch läuft",
     "A call is already in progress!": "Ein Gespräch läuft bereits!",
-    "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Du kannst keine Nachrichten senden bis du die <consentLink>unsere Geschläftsbedingungen</consentLink> gelesen und akzeptiert hast.",
+    "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Du kannst keine Nachrichten senden bis du <consentLink>unsere Geschäftsbedingungen</consentLink> gelesen und akzeptiert hast.",
     "Demote yourself?": "Selbst zurückstufen?",
     "Demote": "Zurückstufen",
     "This event could not be displayed": "Dieses Ereignis konnte nicht angezeigt werden",
@@ -865,7 +865,7 @@
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s hat die Hauptadresse zu diesem Raum auf %(address)s gesetzt.",
     "%(senderName)s removed the main address for this room.": "%(senderName)s entfernte die Hauptadresse von diesem Raum.",
     "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Bevor du Log-Dateien übermittelst, musst du ein <a>GitHub-Issue erstellen</a> um dein Problem zu beschreiben.",
-    "%(brand)s now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!": "%(brand)s benutzt nun 3 - 5-mal weniger Arbeitsspeicher, indem Informationen über andere Nutzer:innen erst bei Bedarf geladen werden. Bitte warte, während die Daten erneut mit dem Server abgeglichen werden!",
+    "%(brand)s now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!": "%(brand)s benutzt nun 3 - 5-mal weniger Arbeitsspeicher, indem Informationen über andere Nutzer erst bei Bedarf geladen werden. Bitte warte, während die Daten erneut mit dem Server abgeglichen werden!",
     "Updating %(brand)s": "Aktualisiere %(brand)s",
     "You've previously used %(brand)s 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, %(brand)s needs to resync your account.": "Du hast zuvor %(brand)s auf %(host)s ohne das verzögerte Laden von Mitgliedern genutzt. In dieser Version war das verzögerte Laden deaktiviert. Da die lokal zwischengespeicherten Daten zwischen diesen Einstellungen nicht kompatibel sind, muss %(brand)s dein Konto neu synchronisieren.",
     "If the other version of %(brand)s is still open in another tab, please close it as using %(brand)s on the same host with both lazy loading enabled and disabled simultaneously will cause issues.": "Wenn %(brand)s mit der alten Version in einem anderen Tab geöffnet ist, schließe dies bitte, da das parallele Nutzen von %(brand)s auf demselben Host mit aktivierten und deaktivierten verzögertem Laden, Probleme verursachen wird.",
@@ -873,7 +873,7 @@
     "Clear cache and resync": "Zwischenspeicher löschen und erneut synchronisieren",
     "Please review and accept the policies of this homeserver:": "Bitte sieh dir alle Bedingungen dieses Heimservers an und akzeptiere sie:",
     "Add some now": "Jemanden jetzt hinzufügen",
-    "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Du bist ein:e Administrator:in dieser Community. Du wirst nicht erneut hinzutreten können, wenn du nicht von einem/r anderen Administrator:in eingeladen wirst.",
+    "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Du bist ein Administrator dieser Community. Du wirst nicht erneut hinzutreten können, wenn du nicht von einem anderen Administrator eingeladen wirst.",
     "Open Devtools": "Entwicklerwerkzeuge öffnen",
     "Show developer tools": "Zeige Entwicklerwerkzeuge",
     "Unable to load! Check your network connectivity and try again.": "Konnte nicht geladen werden! Überprüfe die Netzwerkverbindung und versuche es erneut.",
@@ -923,7 +923,7 @@
     "Names and surnames by themselves are easy to guess": "Namen und Familiennamen alleine sind einfach zu erraten",
     "Common names and surnames are easy to guess": "Häufige Namen und Familiennamen sind einfach zu erraten",
     "You do not have permission to invite people to this room.": "Du kannst keine Personen in diesen Raum einladen.",
-    "User %(user_id)s does not exist": "Benutzer:in %(user_id)s existiert nicht",
+    "User %(user_id)s does not exist": "Benutzer %(user_id)s existiert nicht",
     "Unknown server error": "Unbekannter Serverfehler",
     "Failed to invite users to the room:": "Konnte Benutzer nicht in den Raum einladen:",
     "Short keyboard patterns are easy to guess": "Kurze Tastaturmuster sind einfach zu erraten",
@@ -957,14 +957,14 @@
     "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Ohne Sichere Nachrichten-Wiederherstellung einzurichten, wirst du deine sichere Nachrichtenhistorie verlieren, wenn du dich abmeldest.",
     "If you don't want to set this up now, you can later in Settings.": "Wenn du dies jetzt nicht einrichten willst, kannst du dies später in den Einstellungen tun.",
     "New Recovery Method": "Neue Wiederherstellungsmethode",
-    "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Wenn du die neue Wiederherstellungsmethode nicht festgelegt hast, versucht ein/e Angreifer!n möglicherweise, auf dein Konto zuzugreifen. Ändere dein Kontopasswort und lege sofort eine neue Wiederherstellungsmethode in den Einstellungen fest.",
+    "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Wenn du die neue Wiederherstellungsmethode nicht festgelegt hast, versucht ein Angreifer möglicherweise, auf dein Konto zuzugreifen. Ändere dein Kontopasswort und lege sofort eine neue Wiederherstellungsmethode in den Einstellungen fest.",
     "Set up Secure Messages": "Richte sichere Nachrichten ein",
     "Go to Settings": "Gehe zu Einstellungen",
     "Sign in with single sign-on": "Melde dich mit „Single Sign-On“ an",
     "Unrecognised address": "Nicht erkannte Adresse",
-    "User %(user_id)s may or may not exist": "Unklar, ob Benutzer:in %(user_id)s existiert",
+    "User %(user_id)s may or may not exist": "Unklar, ob Benutzer %(user_id)s existiert",
     "Prompt before sending invites to potentially invalid matrix IDs": "Nachfragen, bevor Einladungen zu möglichen ungültigen Matrix-IDs gesendet werden",
-    "The following users may not exist": "Eventuell existieren folgende Benutzer:innen nicht",
+    "The following users may not exist": "Eventuell existieren folgende Benutzer nicht",
     "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "Profile für die unteren Matrix IDs wurden nicht gefunden - willst Du sie trotzdem einladen?",
     "Invite anyway and never warn me again": "Trotzdem einladen und mich nicht mehr warnen",
     "Invite anyway": "Trotzdem einladen",
@@ -989,10 +989,10 @@
     "Messages containing my username": "Nachrichten, die meinen Benutzernamen enthalten",
     "The other party cancelled the verification.": "Die Gegenstelle hat die Überprüfung abgebrochen.",
     "Verified!": "Verifiziert!",
-    "You've successfully verified this user.": "Du hast diese:n Benutzer:in erfolgreich verifiziert.",
-    "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Sichere Nachrichten mit diesem/r Benutzer:in sind Ende-zu-Ende-verschlüsselt und können nicht von Dritten gelesen werden.",
+    "You've successfully verified this user.": "Du hast diesen Benutzer erfolgreich verifiziert.",
+    "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Sichere Nachrichten mit diesem Benutzer sind Ende-zu-Ende-verschlüsselt und können nicht von Dritten gelesen werden.",
     "Got It": "Verstanden",
-    "Verify this user by confirming the following number appears on their screen.": "Verifiziere diese Nutzer:in, indem du bestätigst, dass die folgende Nummer auf dessen Bildschirm erscheint.",
+    "Verify this user by confirming the following number appears on their screen.": "Verifiziere diesen Nutzer, indem du bestätigst, dass die folgende Nummer auf dessen Bildschirm erscheint.",
     "Yes": "Ja",
     "No": "Nein",
     "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.": "Wir haben dir eine E-Mail geschickt, um deine Adresse zu überprüfen. Bitte folge den Anweisungen dort und klicke dann auf die Schaltfläche unten.",
@@ -1111,7 +1111,7 @@
     "Ignored users": "Ignorierte Benutzer",
     "Key backup": "Schlüsselsicherung",
     "Gets or sets the room topic": "Raumthema anzeigen oder ändern",
-    "Verify this user by confirming the following emoji appear on their screen.": "Verifiziere diese Nutzer:in, indem du bestätigst, dass folgende Emojis auf dessen Bildschirm erscheinen.",
+    "Verify this user by confirming the following emoji appear on their screen.": "Verifiziere diesen Nutzer, indem du bestätigst, dass folgende Emojis auf dessen Bildschirm erscheinen.",
     "Missing media permissions, click the button below to request.": "Fehlende Medienberechtigungen. Drücke auf den Knopf unten, um sie anzufordern.",
     "Request media permissions": "Medienberechtigungen anfordern",
     "Main address": "Primäre Adresse",
@@ -1194,8 +1194,8 @@
     "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s hat Abzeichen der Gruppen %(groups)s für diesen Raum aktiviert.",
     "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s hat Abzeichen der Gruppen %(groups)s in diesem Raum deaktiviert.",
     "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s hat Abzeichen von %(newGroups)s aktiviert und von %(oldGroups)s deaktiviert.",
-    "User %(userId)s is already in the room": "Nutzer:in %(userId)s ist bereits im Raum",
-    "The user must be unbanned before they can be invited.": "Die Verbannung des/der Nutzer:in muss aufgehoben werden, bevor er/sie eingeladen werden kann.",
+    "User %(userId)s is already in the room": "Nutzer %(userId)s ist bereits im Raum",
+    "The user must be unbanned before they can be invited.": "Nutzer müssen entbannt werden, bevor sie eingeladen werden können.",
     "Show read receipts sent by other users": "Zeige Lesebestätigungen anderer Benutzer",
     "Scissors": "Scheren",
     "<a>Upgrade</a> to your own domain": "<a>Upgrade</a> zu deiner eigenen Domain",
@@ -1209,10 +1209,10 @@
     "Modify widgets": "Widgets bearbeiten",
     "Default role": "Standard Rolle",
     "Send messages": "Nachrichten senden",
-    "Invite users": "Benutzer:innen einladen",
+    "Invite users": "Benutzer einladen",
     "Change settings": "Einstellungen ändern",
-    "Kick users": "Benutzer:innen kicken",
-    "Ban users": "Benutzer:innen verbannen",
+    "Kick users": "Benutzer kicken",
+    "Ban users": "Benutzer verbannen",
     "Remove messages": "Nachrichten löschen",
     "Notify everyone": "Jeden benachrichtigen",
     "Send %(eventType)s events": "%(eventType)s-Ereignisse senden",
@@ -1339,7 +1339,7 @@
     "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)": "Lesebestätigungen für Nachrichten senden (Deaktivieren erfordert einen kompatiblen Heimserver)",
     "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 und Servern, die du blockiert hast - verlasse diesen Raum nicht!",
+    "This is your list of users/servers you have blocked - don't leave the room!": "Dies ist die Liste von Benutzer und Servern, die du blockiert hast - verlasse diesen Raum nicht!",
     "Accept <policyLink /> to continue:": "Akzeptiere <policyLink />, um fortzufahren:",
     "Change identity server": "Identitätsserver wechseln",
     "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.": "Du solltest deine <b>persönlichen Daten</b> vom Identitätsserver <idserver /> entfernen, bevor du die Verbindung trennst. Leider ist der Identitätsserver <idserver /> derzeit offline oder kann nicht erreicht werden.",
@@ -1384,7 +1384,7 @@
     "Cannot connect to integration manager": "Verbindung zum Integrationsmanager fehlgeschlagen",
     "The integration manager is offline or it cannot reach your homeserver.": "Der Integrationsmanager ist offline oder er kann den Heimserver nicht erreichen.",
     "not stored": "nicht gespeichert",
-    "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "Die Sicherung hat eine Signatur von <verify>unbekanntem/r</verify> Nutzer:in mit ID %(deviceId)s",
+    "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "Die Sicherung hat eine Signatur von <verify>unbekanntem</verify> Nutzer mit ID %(deviceId)s",
     "Backup key stored: ": "Backup Schlüssel gespeichert: ",
     "Clear notifications": "Benachrichtigungen löschen",
     "Disconnect from the identity server <current /> and connect to <new /> instead?": "Vom Identitätsserver <current /> trennen, und stattdessen eine Verbindung zu <new /> aufbauen?",
@@ -1415,7 +1415,7 @@
     "Unsubscribe": "Deabonnieren",
     "View rules": "Regeln öffnen",
     "You are currently subscribed to:": "Du abonnierst momentan:",
-    "⚠ These settings are meant for advanced users.": "⚠ Diese Einstellungen sind für fortgeschrittene Nutzer:innen gedacht.",
+    "⚠ These settings are meant for advanced users.": "⚠ Diese Einstellungen sind für fortgeschrittene Nutzer gedacht.",
     "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Ob du %(brand)s auf einem Gerät verwendest, bei dem das Tasten die primäre Eingabemöglichkeit ist",
     "Whether you're using %(brand)s as an installed Progressive Web App": "Ob du %(brand)s als installierte progressive Web-App verwendest",
     "Your user agent": "Dein User-Agent",
@@ -1445,7 +1445,7 @@
     "Recently Direct Messaged": "Kürzlich direkt verschickt",
     "Go": "Los",
     "Command Help": "Befehl Hilfe",
-    "To help us prevent this in future, please <a>send us logs</a>.": "Um uns zu helfen, dies in Zukunft zu vermeiden, <a>sende uns bitte Logs</a>.",
+    "To help us prevent this in future, please <a>send us logs</a>.": "Um uns zu helfen, dies in Zukunft zu vermeiden, <a>sende uns bitte die Protokolldateien</a>.",
     "Notification settings": "Benachrichtigungseinstellungen",
     "Help": "Hilf uns",
     "Filter": "Filtern",
@@ -1454,8 +1454,8 @@
     "Go Back": "Zurückgehen",
     "Notification Autocomplete": "Benachrichtigung Autovervollständigen",
     "If disabled, messages from encrypted rooms won't appear in search results.": "Wenn deaktiviert, werden Nachrichten von verschlüsselten Räumen nicht in den Ergebnissen auftauchen.",
-    "This user has not verified all of their sessions.": "Diese:r Benutzer:in hat nicht alle seine/ihre Sitzungen verifiziert.",
-    "You have verified this user. This user has verified all of their sessions.": "Du hast diese/n Nutzer:in verifiziert. Er/Sie hat alle seine/ihre Sitzungen verifiziert.",
+    "This user has not verified all of their sessions.": "Dieser Benutzer hat nicht alle seine Sitzungen verifiziert.",
+    "You have verified this user. This user has verified all of their sessions.": "Du hast diesen Nutzer verifiziert. Der Nutzer hat alle seine Sitzungen verifiziert.",
     "Your key share request has been sent - please check your other sessions for key share requests.": "Deine Schlüsselanfrage wurde gesendet - sieh in deinen anderen Sitzungen nach der Schlüsselanfrage.",
     "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.": "Schlüsselanfragen werden automatisch an deine anderen Sitzungen gesendet. Wenn du sie abgelehnt oder ignoriert hast, klicke hier, um die Schlüssel erneut anzufordern.",
     "If your other sessions do not have the key for this message you will not be able to decrypt them.": "Wenn deine anderen Sitzungen nicht über den Schlüssel für diese Nachricht verfügen, kannst du die Nachricht nicht entschlüsseln.",
@@ -1490,7 +1490,7 @@
     "Use bots, bridges, widgets and sticker packs": "Benutze Bots, Bridges, Widgets und Sticker-Packs",
     "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "Wenn du dein Passwort änderst, werden alle Ende-zu-Ende-Verschlüsselungsschlüssel für alle deine Sitzungen zurückgesetzt, sodass der verschlüsselte Chat-Verlauf nicht mehr lesbar ist. Richte ein Schlüssel-Backup ein oder exportiere deine Raumschlüssel aus einer anderen Sitzung, bevor du dein Passwort zurücksetzst.",
     "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.": "Du wurdest von allen Sitzungen abgemeldet und erhälst keine Push-Benachrichtigungen mehr. Um die Benachrichtigungen wieder zu aktivieren, melde dich auf jedem Gerät erneut an.",
-    "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Aktualisiere diese Sitzung, damit sie andere Sitzungen verifizieren kann, indem sie dir Zugang zu verschlüsselten Nachrichten gewährt und sie für andere Benutzer:innen als vertrauenswürdig markiert.",
+    "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Aktualisiere diese Sitzung, damit sie andere Sitzungen verifizieren kann, indem sie dir Zugang zu verschlüsselten Nachrichten gewährt und sie für andere Benutzer als vertrauenswürdig markiert.",
     "Sign out and remove encryption keys?": "Abmelden und Verschlüsselungsschlüssel entfernen?",
     "Sign in to your Matrix account on <underlinedServerName />": "Melde dich bei deinem Matrix-Konto auf <underlinedServerName /> an",
     "Enter your password to sign in and regain access to your account.": "Gib dein Passwort ein, um dich anzumelden und wieder Zugang zu deinem Konto zu erhalten.",
@@ -1562,18 +1562,18 @@
     "You're previewing %(roomName)s. Want to join it?": "Du betrachtest %(roomName)s. Willst du beitreten?",
     "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s hat die alternative Adresse 2%(addresses)s für diesen Raum hinzugefügt.",
     "%(senderName)s changed the addresses for this room.": "%(senderName)s hat die Adresse für diesen Raum geändert.",
-    "Displays information about a user": "Zeigt Informationen über Benutzer:in",
+    "Displays information about a user": "Zeigt Informationen über Benutzer",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s hat den Raumnamen von %(oldRoomName)s zu %(newRoomName)s geändert.",
     "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s hat die alternative Adresse %(addresses)s für diesen Raum hinzugefügt.",
     "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s hat die alternativen Adressen %(addresses)s für diesen Raum entfernt.",
     "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s hat die alternative Adresse %(addresses)s für diesen Raum entfernt.",
     "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s hat die alternative Adresse für diesen Raum geändert.",
     "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s hat die Haupt- und Alternativadressen für diesen Raum geändert.",
-    "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s entfernte die Ausschluss-Regel für Benutzer:innen, die %(glob)s entsprechen",
+    "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s entfernte die Ausschluss-Regel für Benutzer, die %(glob)s entsprechen",
     "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s entfernte die Ausschluss-Regel für Räume, die %(glob)s entsprechen",
     "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s entfernte die Ausschluss-Regel für Server, die %(glob)s entsprechen",
     "%(senderName)s removed a ban rule matching %(glob)s": "%(senderName)s entfernte die Ausschluss-Regel, die %(glob)s entspricht",
-    "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s aktualisierte die Ausschluss-Regel für Nutzer:innen, die aufgrund von %(reason)s %(glob)s entsprechen",
+    "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s aktualisierte die Ausschluss-Regel für Benutzer, die aufgrund von %(reason)s %(glob)s entsprechen",
     "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s aktualisierte die Ausschluss-Regel für Räume, die aufgrund von %(reason)s %(glob)s entsprechen",
     "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s aktualisierte die Ausschluss-Regel für Server, die aufgrund von %(reason)s %(glob)s entsprechen",
     "%(senderName)s updated a ban rule matching %(glob)s for %(reason)s": "%(senderName)s aktualisierte eine Ausschluss-Regel, die wegen %(reason)s %(glob)s entspricht",
@@ -1584,7 +1584,7 @@
     "Do you want to chat with %(user)s?": "Möchtest du mit %(user)s chatten?",
     "<userName/> wants to chat": "<userName/> möchte mit dir chatten",
     "Start chatting": "Chat starten",
-    "Reject & Ignore user": "Ablehnen & Nutzer:in ignorieren",
+    "Reject & Ignore user": "Ablehnen und Nutzer ignorieren",
     "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s ändert eine Ausschluss-Regel von %(oldGlob)s nach %(newGlob)s, wegen %(reason)s",
     "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s ändert eine Ausschluss-Regel für Räume von %(oldGlob)s nach %(newGlob)s, wegen %(reason)s",
     "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "Auf den Server turn.matrix.org zurückgreifen, falls deine Heimserver keine Anruf-Assistenz anbietet (deine IP-Adresse wird während eines Anrufs geteilt)",
@@ -1643,7 +1643,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": "Benutzer:in konnte nicht im Raum gefunden werden",
+    "Could not find user in room": "Benutzer konnte nicht im Raum gefunden werden",
     "Click the button below to confirm adding this email address.": "Klicke unten auf die Schaltfläche, um die hinzugefügte E-Mail-Adresse zu bestätigen.",
     "Confirm adding phone number": "Hinzugefügte Telefonnummer bestätigen",
     "%(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",
@@ -1652,7 +1652,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",
-    "Ask this user to verify their session, or manually verify it below.": "Bitte diese/n Nutzer:in, seine/ihre Sitzung zu verifizieren, oder verifiziere diese unten manuell.",
+    "Ask this user to verify their session, or manually verify it below.": "Bitte diesen Nutzer, seine Sitzung zu verifizieren, oder verifiziere diese unten manuell.",
     "a few seconds from now": "in ein paar Sekunden",
     "Manually verify all remote sessions": "Alle Remotesitzungen manuell verifizieren",
     "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:",
@@ -1702,15 +1702,15 @@
     "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 %(brand)s 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 %(brand)s mit beliebigen Zeichen übereinstimmt. Bspw. würde <code>@bot: *</code> alle Benutzer:innen 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.": "Das Ignorieren von Personen erfolgt über Sperrlisten. Wenn eine Sperrliste abonniert wird, werden die von dieser Liste blockierten Benutzer:innen und Server ausgeblendet.",
+    "Add users and servers you want to ignore here. Use asterisks to have %(brand)s match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.": "Füge hier die Benutzer und Server hinzu, die du ignorieren willst. Verwende Sternchen, damit %(brand)s mit beliebigen Zeichen übereinstimmt. Bspw. würde <code>@bot: *</code> alle Benutzer 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.": "Das Ignorieren von Personen erfolgt über Sperrlisten. Wenn eine Sperrliste abonniert wird, werden die von dieser Liste blockierten Benutzer und 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:innen/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.",
+    "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/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",
     "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:innen zu ignorieren.",
+    "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 zu ignorieren.",
     "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",
@@ -1728,7 +1728,7 @@
     "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.",
     "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:innen vertrauen ihr vielleicht nicht",
+    "Other users may not trust it": "Andere Benutzer vertrauen ihr vielleicht nicht",
     "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)",
@@ -1759,7 +1759,7 @@
     " to store messages from ": " um Nachrichten von ",
     "%(brand)s is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom %(brand)s Desktop with <nativeLink>search components added</nativeLink>.": "%(brand)s 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 %(brand)s Desktop mit der <nativeLink>integrierten Suchfunktion bauen</nativeLink>.",
     "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 von diesem/r Benutzer!n",
+    "Backup has a <validity>invalid</validity> signature from this user": "Die Sicherung hat eine <validity>ungültige</validity> Signatur von diesem Benutzer",
     "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>",
@@ -1781,7 +1781,7 @@
     "Complete": "Abschließen",
     "Revoke": "Widerrufen",
     "Share": "Teilen",
-    "You have not verified this user.": "Du hast diese:n Nutzer:in nicht verifiziert.",
+    "You have not verified this user.": "Du hast diesen Nutzer nicht verifiziert.",
     "Everyone in this room is verified": "Alle in diesem Raum sind verifiziert",
     "Mod": "Mod",
     "Invite only": "Nur auf Einladung",
@@ -1789,10 +1789,10 @@
     "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?": "Nutzer!n 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 dieser/s Nutzer!n/s abgemeldet und ein erneutes Anmelden verhindert. Zusätzlich wird sie/er aus allen Räumen entfernt. Diese Aktion kann nicht rückgängig gemacht werden. Bist du sicher, dass du diese/n Nutzer!n deaktivieren willst?",
-    "Deactivate user": "Nutzer!n deaktivieren",
-    "Failed to deactivate user": "Deaktivieren des/der Nutzer!n fehlgeschlagen",
+    "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",
@@ -1806,7 +1806,7 @@
     "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/r Raum-Administrator:in weitergeben.",
+    "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": "Dennoch versuchen beizutreten",
     "You can still join it because this is a public room.": "Du kannst dennoch beitreten, da es ein öffentlicher Raum ist.",
@@ -1817,7 +1817,7 @@
     "Share this email in Settings to receive invites directly in %(brand)s.": "Teile diese E-Mail-Adresse in den Einstellungen um Einladungen direkt in %(brand)s zu erhalten.",
     "%(roomName)s can't be previewed. Do you want to join it?": "Vorschau von %(roomName)s kann nicht angezeigt 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 eine/n Raum-Administrator:in zu prüfen, ob du berechtigt 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 zu prüfen, ob du berechtigt bist.",
     "%(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 wurde, beim Versuch den Raum zu betreten, zurückgegeben. Wenn du denkst dass diese Meldung nicht korrekt ist, <issueLink>erstelle bitte einen Fehlerbericht</issueLink>.",
     "%(count)s unread messages including mentions.|other": "%(count)s ungelesene Nachrichten einschließlich Erwähnungen.",
     "%(count)s unread messages including mentions.|one": "1 ungelesene Erwähnung.",
@@ -1836,33 +1836,33 @@
     "Mark all as read": "Alle als gelesen markieren",
     "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/r verwendet werden, um den Raum zu betreten. Um eine Adresse zu veröffentlichen musst du zunächst eine lokale Adresse anlegen.",
+    "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 Nutzer:innen den Raum auf deinem Heimserver (%(localDomain)s) finden können",
+    "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/die Empfänger:in haben die Schlüssel, um sie zu entschlüsseln.",
+    "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": "Nutzer!n verifizieren",
-    "For extra security, verify this user by checking a one-time code on both of your devices.": "Für zusätzliche Sicherheit, verifiziere diese/n Nutzer!n, durch Vergleichen eines Einmal-Codes auf euren beiden Geräten.",
+    "Verify User": "Nutzer verifizieren",
+    "For extra security, verify this user by checking a one-time code on both of your devices.": "Für zusätzliche Sicherheit, verifiziere diesen Nutzer, durch Vergleichen eines Einmal-Codes auf euren beiden Geräten.",
     "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/die zu verifizierende Nutzer:in angemeldet ist",
+    "The homeserver the user you’re verifying is connected to": "Der Heimserver, an dem der zu verifizierende Nutzer angemeldet ist",
     "Yours, or the other users’ internet connection": "Deine oder die Internetverbindung des Gegenüber",
     "Yours, or the other users’ session": "Deine Sitzung oder die des Gegenüber",
     "<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.",
     "Verify by scanning": "Verifizierung durch QR-Code-Scannen",
     "If you can't scan the code above, verify by comparing unique emoji.": "Wenn du den obigen Code nicht scannen kannst, verifiziere stattdessen durch den Emoji-Vergleich.",
-    "Verify all users in a room to ensure it's secure.": "Verifiziere alle Benutzer:innen 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:innen in verschlüsselten Räumen um die vollständige Sicherheit zu gewährleisten.",
+    "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.",
@@ -1875,7 +1875,7 @@
     "Compare emoji": "Vergleiche Emojis",
     "Message Actions": "Nachrichtenaktionen",
     "Show image": "Bild anzeigen",
-    "You have ignored this user, so their message is hidden. <a>Show anyways.</a>": "Du hast diese/n Nutzer!n ignoriert, sodass seine/ihre Nachricht ausgeblendet ist. <a>Dennoch anzeigen.</a>",
+    "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",
@@ -1954,10 +1954,10 @@
     "Verification Requests": "Verifizierungsanfrage",
     "Integrations are disabled": "Integrationen sind deaktiviert",
     "Integrations not allowed": "Integrationen sind nicht erlaubt",
-    "Failed to invite the following users to chat: %(csvUsers)s": "Einladen der folgenden Nutzer:innen fehlgeschlagen: %(csvUsers)s",
-    "Something went wrong trying to invite the users.": "Beim Einladen der Nutzer:innen lief etwas schief.",
-    "Failed to find the following users": "Folgenden Nutzer:innen konnten nicht gefunden werden",
-    "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Folgende Nutzer:innen konnten nicht eingeladen werden, da sie nicht existieren oder ungültig sind: %(csvNames)s",
+    "Failed to invite the following users to chat: %(csvUsers)s": "Einladen der folgenden Nutzer fehlgeschlagen: %(csvUsers)s",
+    "Something went wrong trying to invite the users.": "Beim Einladen der Nutzer lief etwas schief.",
+    "Failed to find the following users": "Folgenden Nutzer konnten nicht gefunden werden",
+    "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Folgende Nutzer konnten nicht eingeladen werden, da sie nicht existieren oder ungültig sind: %(csvNames)s",
     "a new master key signature": "Eine neue Hauptschlüssel Signatur",
     "a new cross-signing key signature": "Eine neue Cross-Signing-Schlüsselsignatur",
     "a device cross-signing signature": "Eine Geräte Schlüssel Signatur",
@@ -1986,7 +1986,7 @@
     "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 einen Fehler meldest.",
-    "Automatically invite users": "Nutzer:innen automatisch einladen",
+    "Automatically invite users": "Nutzer automatisch einladen",
     "Upgrade private room": "Privaten Raum aktualisieren",
     "Upgrade public room": "Öffentlichen Raum aktualisieren",
     "This usually only affects how the room is processed on the server. If you're having problems with your %(brand)s, 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 %(brand)s hast, <a>melde bitte einen Bug</a>.",
@@ -2052,8 +2052,8 @@
     "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:innen 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:innen 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 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 Kontakte zu finden und von anderen 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>.": "Um ein Matrix-bezogenes Sicherheitsproblem zu melden, lies bitte die Matrix.org <a>Sicherheitsrichtlinien</a>.",
@@ -2069,12 +2069,12 @@
     "%(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.",
-    "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Wenn du diese/e Nutzer!n verifizierst werden seine/ihre Sitzungen für dich und deine Sitzungen für ihn/sie 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.": "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 %(brand)s doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Dein %(brand)s 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 Benutzer:innen nicht einladen. Bitte überprüfe sie 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>.",
     "Upload completed": "Hochladen abgeschlossen",
@@ -2096,7 +2096,7 @@
     "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 die richtige Wiederherstellungspassphrase eingegeben hast.",
     "Nice, strong password!": "Super, ein starkes Passwort!",
-    "Other users can invite you to rooms using your contact details": "Andere Benutzer:innen 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 optional E-Mail oder Telefon, um von Anderen gefunden zu werden.",
     "Explore Public Rooms": "Öffentliche Räume erkunden",
     "If you've joined lots of rooms, this might take a while": "Du bist einer Menge Räumen beigetreten, das kann eine Weile dauern",
@@ -2174,7 +2174,7 @@
     "Toggle this dialog": "Diesen Dialog ein-/ausblenden",
     "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/r Benutzer:in eine Nachricht",
+    "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…",
     "You've successfully verified your device!": "Du hast dein Gerät erfolgreich verifiziert!",
     "QR Code": "QR-Code",
@@ -2443,8 +2443,8 @@
     "Invite people to join %(communityName)s": "Lade Leute ein %(communityName)s beizutreten",
     "An image will help people identify your community.": "Ein Bild hilft anderen, deine Community zu Identifizieren.",
     "Use this when referencing your community to others. The community ID cannot be changed.": "Verwende dies, um deine Community von andere referenzieren zu lassen. Die Community-ID kann später nicht geändert werden.",
-    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone.": "Private Räume können nur auf Einladung gefunden und betreten werden. Öffentliche Räume können von jedem/r gefunden und betreten werden.",
-    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone in this community.": "Private Räume können nur auf Einladung gefunden und betreten werden. Öffentliche Räume können von jedem/r in dieser Community gefunden und betreten werden.",
+    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone.": "Private Räume können nur auf Einladung gefunden und betreten werden. Öffentliche Räume können von jedem gefunden und betreten werden.",
+    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone in this community.": "Private Räume können nur auf Einladung gefunden und betreten werden. Öffentliche Räume können von jedem in dieser Community gefunden und betreten werden.",
     "You might enable this if the room will only be used for collaborating with internal teams on your homeserver. This cannot be changed later.": "Du solltest dies aktivieren, wenn der Raum nur für die Zusammenarbeit mit internen Teams auf deinem Heimserver verwendet wird. Dies kann später nicht mehr geändert werden.",
     "You might disable this if the room will be used for collaborating with external teams who have their own homeserver. This cannot be changed later.": "Du solltest dies deaktivieren, wenn der Raum für die Zusammenarbeit mit externen Teams auf deren Home-Server verwendet wird. Dies kann später nicht mehr geändert werden.",
     "Block anyone not part of %(serverName)s from ever joining this room.": "Blockiere alle, die nicht Teil von %(serverName)s sind, diesen Raum jemals zu betreten.",
@@ -2503,7 +2503,7 @@
     "Your server requires encryption to be enabled in private rooms.": "Für deinen Server muss die Verschlüsselung in privaten Räumen aktiviert sein.",
     "Start a conversation with someone using their name or username (like <userId/>).": "Starte ein Gespräch unter Verwendung des Namen oder Benutzernamens des Gegenübers (z. B. <userId/>).",
     "This won't invite them to %(communityName)s. To invite someone to %(communityName)s, click <a>here</a>": "Das wird sie nicht zu %(communityName)s einladen. Um jemand zu %(communityName)s einzuladen, klicke <a>hier</a>",
-    "Invite someone using their name, username (like <userId/>) or <a>share this room</a>.": "Lade jemand mittels seinem/ihrem Namen oder Benutzernamen (z.B. <userId/>) ein, oder <a>teile diesem Raum</a>.",
+    "Invite someone using their name, username (like <userId/>) or <a>share this room</a>.": "Lade jemand mit Hilfe des Benutzernamens (z.B. <userId/>) oder Personennamens ein, oder <a>teile diesem Raum</a>.",
     "Unable to set up keys": "Schlüssel können nicht eingerichtet werden",
     "Use the <a>Desktop app</a> to see all encrypted files": "Nutze die <a>Desktop-App</a> um alle verschlüsselten Dateien zu sehen",
     "Use the <a>Desktop app</a> to search encrypted messages": "Nutze die <a>Desktop-App</a> um verschlüsselte Nachrichten zu suchen",
@@ -2638,8 +2638,8 @@
     "Please go into as much detail as you like, so we can track down the problem.": "Bitte nenne so viele Details wie du möchtest, sodass wir das Problem finden können.",
     "Comment": "Kommentar",
     "There are two ways you can provide feedback and help us improve %(brand)s.": "Es gibt zwei Wege wie du Feedback geben kannst und uns helfen kannst %(brand)s zu verbessern.",
-    "Please view <existingIssuesLink>existing bugs on Github</existingIssuesLink> first. No match? <newIssueLink>Start a new one</newIssueLink>.": "Bitte wirf einen Blick auf <existingIssuesLink>existierende Bugs auf Github</existingIssuesLink>. Keinen gefunden? <newIssueLink>Erstelle einen neuen</newIssueLink>.",
-    "PRO TIP: If you start a bug, please submit <debugLogsLink>debug logs</debugLogsLink> to help us track down the problem.": "PRO TIPP: Wenn du einen Bug meldest, füge bitte <debugLogsLink>Debug-Logs</debugLogsLink> hinzu um uns zu helfen das Problem zu finden.",
+    "Please view <existingIssuesLink>existing bugs on Github</existingIssuesLink> first. No match? <newIssueLink>Start a new one</newIssueLink>.": "Bitte wirf einen Blick auf <existingIssuesLink>existierende Programmfehler auf Github</existingIssuesLink>. Keinen gefunden? <newIssueLink>Erstelle einen neuen</newIssueLink>.",
+    "PRO TIP: If you start a bug, please submit <debugLogsLink>debug logs</debugLogsLink> to help us track down the problem.": "PRO TIPP: Wenn du einen Programmfehler meldest, füge bitte <debugLogsLink>Debug-Logs</debugLogsLink> hinzu um uns zu helfen das Problem zu finden.",
     "Invite by email": "Via Email einladen",
     "Start a conversation with someone using their name, email address or username (like <userId/>).": "Beginne eine Konversation mit jemanden unter Benutzung des Namens, der Email-Adresse oder der Matrix-ID (wie <userId/>).",
     "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.": "Lade jemanden unter Benutzung seines Namens, E-Mailaddresse oder Benutzername (siehe <userId/>) ein, oder <a>teile diesen Raum</a>.",
@@ -2937,7 +2937,7 @@
     "Other homeserver": "Anderer Homeserver",
     "Sign into your homeserver": "Melde dich bei deinem Homeserver an",
     "Matrix.org is the biggest public homeserver in the world, so it’s a good place for many.": "Matrix.org ist der größte öffentliche Homeserver der Welt und daher ein guter Ort für viele.",
-    "Just a heads up, if you don't add an email and forget your password, you could <b>permanently lose access to your account</b>.": "Aufgepasst: Wenn du keine E-Mail-Adresse angibst und dein Passwort vergisst, kannst du den <b>Zugriff auf deinen Account dauerhaft verlieren</b>.",
+    "Just a heads up, if you don't add an email and forget your password, you could <b>permanently lose access to your account</b>.": "Aufgepasst: Wenn du keine E-Mail-Adresse angibst und dein Passwort vergisst, kannst du den <b>Zugriff auf deinen Konto dauerhaft verlieren</b>.",
     "Continuing without email": "Ohne E-Mail fortfahren",
     "Reason (optional)": "Grund (optional)",
     "Continue with %(provider)s": "Mit %(provider)s fortfahren",
@@ -2979,7 +2979,7 @@
     "Sends the given message with snowfall": "Sendet die gewählte Nachricht mit Schneeflocken",
     "Transfer": "Übertragen",
     "Failed to transfer call": "Anruf-Übertragung fehlgeschlagen",
-    "A call can only be transferred to a single user.": "Ein Anruf kann nur auf eine:n einzelne:n Nutzer:in übertragen werden.",
+    "A call can only be transferred to a single user.": "Ein Anruf kann nur auf einen einzelnen Nutzer übertragen werden.",
     "Set up with a Security Key": "Mit einem Sicherheitsschlüssel einrichten",
     "Use Security Key": "Sicherheitsschlüssel benutzen",
     "Use Security Key or Phrase": "Sicherheitsschlüssel oder -phrase benutzen",
@@ -3003,7 +3003,7 @@
     "Workspace: <networkLink/>": "Arbeitsraum: <networkLink/>",
     "Dial pad": "Wähltastatur",
     "There was an error looking up the phone number": "Beim Suchen der Telefonnummer ist ein Fehler aufgetreten",
-    "Change which room, message, or user you're viewing": "Ändere welchen Raum, Nachricht oder Nutzer:in du siehst",
+    "Change which room, message, or user you're viewing": "Ändere welchen Raum, Nachricht oder Nutzer du siehst",
     "Unable to look up phone number": "Telefonnummer konnte nicht gefunden werden",
     "This session has detected that your Security Phrase and key for Secure Messages have been removed.": "In dieser Sitzung wurde festgestellt, dass deine Sicherheitsphrase und dein Schlüssel für sichere Nachrichten entfernt wurden.",
     "A new Security Phrase and key for Secure Messages have been detected.": "Eine neue Sicherheitsphrase und ein neuer Schlüssel für sichere Nachrichten wurden erkannt.",
@@ -3057,7 +3057,7 @@
     "You should know": "Du solltest wissen",
     "Privacy Policy": "Datenschutz-Richtlinie",
     "Cookie Policy": "Cookie-Richtlinie",
-    "Learn more in our <privacyPolicyLink />, <termsOfServiceLink /> and <cookiePolicyLink />.": "Erfahren mehr in unserer <privacyPolicyLink />, <termsOfServiceLink /> und <cookiePolicyLink />.",
+    "Learn more in our <privacyPolicyLink />, <termsOfServiceLink /> and <cookiePolicyLink />.": "Erfahre mehr in unserer <privacyPolicyLink />, <termsOfServiceLink /> und <cookiePolicyLink />.",
     "Failed to connect to your homeserver. Please close this dialog and try again.": "Verbindung zum Homeserver fehlgeschlagen. Bitte schließe diesen Dialog and versuche es erneut.",
     "Abort": "Abbrechen",
     "Upgrade to %(hostSignupBrand)s": "Zu %(hostSignupBrand)s upgraden",

From 31ce93655a508aee2b37ff199d2c62d8373801f8 Mon Sep 17 00:00:00 2001
From: panoschal <panoschal7@gmail.com>
Date: Sat, 13 Mar 2021 12:28:45 +0000
Subject: [PATCH 330/420] Translated using Weblate (Greek)

Currently translated at 29.4% (852 of 2889 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/el/
---
 src/i18n/strings/el.json | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json
index 9bbef87a69..8700abbff1 100644
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@@ -114,7 +114,7 @@
     "New passwords must match each other.": "Οι νέοι κωδικοί πρόσβασης πρέπει να ταιριάζουν.",
     "(not supported by this browser)": "(δεν υποστηρίζεται από τον περιηγητή)",
     "<not supported>": "<δεν υποστηρίζεται>",
-    "No more results": "Δεν υπάρχουν αποτελέσματα",
+    "No more results": "Δεν υπάρχουν άλλα αποτελέσματα",
     "No results": "Κανένα αποτέλεσμα",
     "OK": "Εντάξει",
     "olm version:": "Έκδοση olm:",
@@ -921,5 +921,9 @@
     "Your user agent": "Η συσκευή σας",
     "Confirm adding phone number": "Επιβεβαιώστε την προσθήκη του τηλεφωνικού αριθμού",
     "Click the button below to confirm adding this email address.": "Πιέστε το κουμπί από κάτω για να επιβεβαιώσετε την προσθήκη της διεύθυνσης ηλ. ταχυδρομείου.",
-    "Confirm adding email": "Επιβεβαιώστε την προσθήκη διεύθυνσης ηλ. ταχυδρομείου"
+    "Confirm adding email": "Επιβεβαιώστε την προσθήκη διεύθυνσης ηλ. ταχυδρομείου",
+    "Done": "Τέλος",
+    "Not Trusted": "Μη Έμπιστο",
+    "You're already in a call with this person.": "Είστε ήδη σε κλήση με αυτόν τον χρήστη.",
+    "Already in call": "Ήδη σε κλήση"
 }

From 3fd446c7b13dc65a8da3740bf579c8a215863dca Mon Sep 17 00:00:00 2001
From: iaiz <git@iapellaniz.com>
Date: Tue, 16 Mar 2021 13:21:21 +0000
Subject: [PATCH 331/420] Translated using Weblate (Spanish)

Currently translated at 100.0% (2889 of 2889 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/es/
---
 src/i18n/strings/es.json | 401 +++++++++++++++++++++++++--------------
 1 file changed, 258 insertions(+), 143 deletions(-)

diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 4b50d59f2a..3965433b8c 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -8,8 +8,8 @@
     "Always show message timestamps": "Siempre mostrar las marcas temporales de mensajes",
     "Authentication": "Autenticación",
     "%(items)s and %(lastItem)s": "%(items)s y %(lastItem)s",
-    "and %(count)s others...|other": "y otros %(count)s...",
-    "and %(count)s others...|one": "y otro más...",
+    "and %(count)s others...|other": "y otros %(count)s…",
+    "and %(count)s others...|one": "y otro más…",
     "A new password must be entered.": "Debes ingresar una contraseña nueva.",
     "%(senderName)s answered the call.": "%(senderName)s contestó la llamada.",
     "An error has occurred.": "Un error ha ocurrido.",
@@ -59,12 +59,12 @@
     "Error": "Error",
     "Error decrypting attachment": "Error al descifrar adjunto",
     "Existing Call": "Llamada Existente",
-    "Export E2E room keys": "Exportar claves de salas con Cifrado de Extremo a Extremo",
+    "Export E2E room keys": "Exportar claves de salas con cifrado de extremo a extremo",
     "Failed to ban user": "Bloqueo del usuario falló",
     "Failed to change password. Is your password correct?": "No se ha podido cambiar la contraseña. ¿Has escrito tu contraseña actual correctamente?",
     "Failed to change power level": "Falló al cambiar de nivel de acceso",
     "Failed to forget room %(errCode)s": "No se pudo olvidar la sala %(errCode)s",
-    "Failed to join room": "No se pudo unir a la sala",
+    "Failed to join room": "No se ha podido entrar a la sala",
     "Failed to kick": "No se ha podido echar",
     "Failed to leave room": "No se pudo salir de la sala",
     "Failed to load timeline position": "Fallo al cargar el historial",
@@ -84,21 +84,21 @@
     "Forget room": "Olvidar sala",
     "For security, this session has been signed out. Please sign in again.": "Por seguridad, esta sesión ha sido cerrada. Por favor inicia sesión nuevamente.",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s de %(fromPowerLevel)s a %(toPowerLevel)s",
-    "Guests cannot join this room even if explicitly invited.": "Invitados no pueden unirse a esta sala aun cuando han sido invitados explícitamente.",
+    "Guests cannot join this room even if explicitly invited.": "Los invitados no pueden unirse a esta sala incluso si se les invita explícitamente.",
     "Hangup": "Colgar",
     "Historical": "Historial",
     "Homeserver is": "El servidor base es",
     "Identity Server is": "El Servidor de Identidad es",
     "I have verified my email address": "He verificado mi dirección de correo electrónico",
-    "Import E2E room keys": "Importar claves de salas con Cifrado de Extremo a Extremo",
+    "Import E2E room keys": "Importar claves de salas con cifrado de extremo a extremo",
     "Incorrect verification code": "Verificación de código incorrecta",
     "Invalid Email Address": "Dirección de Correo Electrónico Inválida",
     "Invalid file%(extra)s": "Archivo inválido %(extra)s",
     "%(senderName)s invited %(targetName)s.": "%(senderName)s invitó a %(targetName)s.",
     "Invites": "Invitaciones",
     "Invites user with given id to current room": "Invita al usuario con la ID dada a la sala actual",
-    "Sign in with": "Quiero iniciar sesión con",
-    "Join Room": "Unirse a la Sala",
+    "Sign in with": "Iniciar sesión con",
+    "Join Room": "Unirme a la Sala",
     "%(targetName)s joined the room.": "%(targetName)s se unió a la sala.",
     "%(senderName)s kicked %(targetName)s.": "%(senderName)s echó a %(targetName)s.",
     "Kick": "Echar",
@@ -141,7 +141,7 @@
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s hizo visible el historial futuro de la sala para cualquier persona.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s hizo visible el historial futuro de la sala para desconocido (%(visibility)s).",
     "Something went wrong!": "¡Algo ha fallado!",
-    "Please select the destination room for this message": "Por favor, seleccione la sala destino para este mensaje",
+    "Please select the destination room for this message": "Por favor, selecciona la sala de destino para este mensaje",
     "Create new room": "Crear nueva sala",
     "Start chat": "Iniciar conversación",
     "New Password": "Contraseña nueva",
@@ -168,7 +168,7 @@
     "Search": "Buscar",
     "Search failed": "Falló la búsqueda",
     "Seen by %(userName)s at %(dateTime)s": "Visto por %(userName)s el %(dateTime)s",
-    "Send Reset Email": "Enviar Correo Electrónico de Restauración",
+    "Send Reset Email": "Enviar correo electrónico de restauración",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s envió una imagen.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s invitó a %(targetDisplayName)s a unirse a la sala.",
     "Server error": "Error del servidor",
@@ -180,7 +180,7 @@
     "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s estableció %(displayName)s como su nombre público.",
     "Settings": "Ajustes",
     "Signed Out": "Desconectado",
-    "Sign in": "Conectar",
+    "Sign in": "Iniciar sesión",
     "Sign out": "Cerrar sesión",
     "%(count)s of your messages have not been sent.|other": "Algunos de tus mensajes no han sido enviados.",
     "Someone": "Alguien",
@@ -228,7 +228,7 @@
     "Profile": "Perfil",
     "Public Chat": "Sala pública",
     "Reason": "Motivo",
-    "Register": "Registrar",
+    "Register": "Crear cuenta",
     "%(targetName)s rejected the invitation.": "%(targetName)s rechazó la invitación.",
     "Reject invitation": "Rechazar invitación",
     "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s eliminó su nombre público (%(oldDisplayName)s).",
@@ -240,7 +240,7 @@
     "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s no tiene permiso para enviarte notificaciones - por favor, comprueba los ajustes de tu navegador",
     "%(brand)s was not given permission to send notifications - please try again": "No le has dado permiso a %(brand)s para enviar notificaciones. Por favor, inténtalo de nuevo",
     "%(brand)s version:": "Versión de %(brand)s:",
-    "Room %(roomId)s not visible": "La sala %(roomId)s no está visible",
+    "Room %(roomId)s not visible": "La sala %(roomId)s no es visible",
     "Searches DuckDuckGo for results": "Busca resultados en DuckDuckGo",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Mostrar marcas temporales en formato de 12 horas (ej. 2:30pm)",
     "This email address is already in use": "Esta dirección de correo electrónico ya está en uso",
@@ -345,7 +345,7 @@
     "Jun": "Jun",
     "Jul": "Jul",
     "Aug": "Ago",
-    "Add rooms to this community": "Agregar salas a esta comunidad",
+    "Add rooms to this community": "Añadir salas a esta comunidad",
     "Call Failed": "Llamada fallida",
     "Sep": "Sep",
     "Oct": "Oct",
@@ -360,7 +360,7 @@
     "Your language of choice": "Idioma elegido",
     "Your homeserver's URL": "La URL de tu servidor base",
     "The information being sent to us to help make %(brand)s better includes:": "La información que se nos envía para ayudarnos a mejorar %(brand)s incluye:",
-    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Estés utilizando o no el modo de Texto Enriquecido del Editor de Texto Enriquecido",
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Estés utilizando o no el modo de texto enriquecido del editor de texto enriquecido",
     "Who would you like to add to this community?": "¿A quién te gustaría añadir a esta comunidad?",
     "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Advertencia: cualquier persona que añadas a una comunidad será públicamente visible a cualquiera que conozca la ID de la comunidad",
     "Invite new community members": "Invita nuevos miembros a la comunidad",
@@ -417,7 +417,7 @@
     "Collecting app version information": "Recolectando información de la versión de la aplicación",
     "Keywords": "Palabras clave",
     "Enable notifications for this account": "Activar notificaciones para esta cuenta",
-    "Invite to this community": "Invitar a esta comunidad",
+    "Invite to this community": "Invitar a la comunidad",
     "Messages containing <span>keywords</span>": "Mensajes que contienen <span>palabras clave</span>",
     "Error saving email notification preferences": "Error al guardar las preferencias de notificación por email",
     "Tuesday": "Martes",
@@ -444,16 +444,16 @@
     "Collecting logs": "Recolectando registros",
     "You must specify an event type!": "Debes especificar un tipo de evento!",
     "(HTTP status %(httpStatus)s)": "(estado HTTP %(httpStatus)s)",
-    "Invite to this room": "Invitar a esta sala",
+    "Invite to this room": "Invitar a la sala",
     "Send": "Enviar",
     "Send logs": "Enviar registros",
     "All messages": "Todos los mensajes",
     "Call invitation": "Cuando me inviten a una llamada",
     "Thank you!": "¡Gracias!",
-    "Downloading update...": "Descargando actualizaciones...",
+    "Downloading update...": "Descargando actualización…",
     "State Key": "Clave de estado",
     "Failed to send custom event.": "Ha fallado el envio del evento personalizado.",
-    "What's new?": "¿Qué hay de nuevo?",
+    "What's new?": "Novedades",
     "Notify me for anything else": "Notificarme para cualquier otra cosa",
     "When I'm invited to a room": "Cuando me inviten a una sala",
     "Can't update user notification settings": "No se puede actualizar los ajustes de notificaciones del usuario",
@@ -467,7 +467,7 @@
     "Logs sent": "Registros enviados",
     "Back": "Atrás",
     "Reply": "Responder",
-    "Show message in desktop notification": "Mostrar mensaje en la notificación del escritorio",
+    "Show message in desktop notification": "Mostrar mensaje en las notificaciones de escritorio",
     "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.": "Los registros de depuración contienen datos de uso de la aplicación como nombre de usuario, ID o alias de las salas o grupos que hayas visitado (y nombres de usuario de otros usuarios). No contienen mensajes.",
     "Unhide Preview": "Mostrar vista previa",
     "Unable to join network": "No se puede unir a la red",
@@ -496,7 +496,7 @@
     "Unable to fetch notification target list": "No se puede obtener la lista de destinos de notificación",
     "Quote": "Citar",
     "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!": "En su navegador actual, la apariencia y comportamiento de la aplicación puede ser completamente incorrecta, y algunas de las características podrían no funcionar. Si aún desea probarlo puede continuar, pero ¡no podremos ofrecer soporte por cualquier problema que pudiese tener!",
-    "Checking for an update...": "Comprobando actualizaciones...",
+    "Checking for an update...": "Comprobando actualizaciones…",
     "Every page you use in the app": "Cada página que utilizas en la aplicación",
     "Your device resolution": "La resolución de tu dispositivo",
     "Which officially provided instance you are using, if any": "Qué instancia proporcionada oficialmente estás utilizando, si estás utilizando alguna",
@@ -520,7 +520,7 @@
     "Failed to invite users to %(groupId)s": "No se pudo invitar usuarios a %(groupId)s",
     "Failed to add the following rooms to %(groupId)s:": "No se pudieron añadir las siguientes salas a %(groupId)s:",
     "Restricted": "Restringido",
-    "Missing roomId.": "Falta el Id de sala.",
+    "Missing roomId.": "Falta el ID de sala.",
     "Ignores a user, hiding their messages from you": "Ignora a un usuario, ocultando sus mensajes",
     "Ignored user": "Usuario ignorado",
     "You are now ignoring %(userId)s": "Ahora ignoras a %(userId)s",
@@ -538,11 +538,11 @@
     "Message Pinning": "Mensajes anclados",
     "Always show encryption icons": "Mostrar siempre iconos de cifrado",
     "Automatically replace plain text Emoji": "Reemplazar automáticamente texto por Emojis",
-    "Mirror local video feed": "Clonar transmisión de video local",
+    "Mirror local video feed": "Invertir horizontalmente el vídeo local (espejo)",
     "Send analytics data": "Enviar datos de análisis de estadísticas",
     "Enable inline URL previews by default": "Activar vistas previas de URLs en línea por defecto",
-    "Enable URL previews for this room (only affects you)": "Activar vista previa de URL en esta sala (te afecta a ti)",
-    "Enable URL previews by default for participants in this room": "Activar vista previa de URL por defecto para los participantes en esta sala",
+    "Enable URL previews for this room (only affects you)": "Activar vista previa de URLs en esta sala (solo para ti)",
+    "Enable URL previews by default for participants in this room": "Activar vista previa de URLs por defecto para los participantes en esta sala",
     "Enable widget screenshots on supported widgets": "Activar capturas de pantalla de widget en los widgets soportados",
     "Drop file here to upload": "Soltar aquí el fichero a subir",
     " (unsupported)": " (no soportado)",
@@ -569,7 +569,7 @@
     "Send an encrypted message…": "Enviar un mensaje cifrado…",
     "Jump to message": "Ir al mensaje",
     "No pinned messages.": "No hay mensajes anclados.",
-    "Loading...": "Cargando...",
+    "Loading...": "Cargando…",
     "Pinned Messages": "Mensajes anclados",
     "%(duration)ss": "%(duration)ss",
     "%(duration)sm": "%(duration)sm",
@@ -598,15 +598,15 @@
     "Hide Stickers": "Ocultar Pegatinas",
     "Show Stickers": "Pegatinas",
     "Invalid community ID": "ID de comunidad inválida",
-    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' no es una ID de comunidad válida",
+    "'%(groupId)s' is not a valid community ID": "«%(groupId)s no es una ID de comunidad válida",
     "Flair": "Insignia",
     "Showing flair for these communities:": "Mostrar insignias de las siguientes comunidades:",
     "This room is not showing flair for any communities": "Esta sala no está mostrando insignias de ninguna comunidad",
     "New community ID (e.g. +foo:%(localDomain)s)": "Nueva ID de comunidad (ej. +foo:%(localDomain)s)",
-    "URL previews are enabled by default for participants in this room.": "La vista previa de URL se activa por defecto en los participantes de esta sala.",
-    "URL previews are disabled by default for participants in this room.": "La vista previa se desactiva por defecto para los participantes de esta sala.",
-    "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.": "En salas cifradas como ésta, la vista previa de las URL se desactiva por defecto para asegurar que el servidor base (donde se generan) no puede recopilar información de los enlaces que veas en esta sala.",
-    "URL Previews": "Vista previa de URL",
+    "URL previews are enabled by default for participants in this room.": "La vista previa de URLs se activa por defecto en los participantes de esta sala.",
+    "URL previews are disabled by default for participants in this room.": "La vista previa de URLs se desactiva por defecto para los participantes de esta sala.",
+    "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.": "En salas cifradas como ésta, la vista previa de las URLs se desactiva por defecto para asegurar que el servidor base (donde se generan) no pueda recopilar información de los enlaces que veas en esta sala.",
+    "URL Previews": "Vista previa de URLs",
     "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.": "Cuando alguien incluye una URL en su mensaje, se mostrará una vista previa para ofrecer información sobre el enlace, que incluirá el título, descripción, y una imagen del sitio web.",
     "Error decrypting audio": "Error al descifrar el sonido",
     "Error decrypting image": "Error al descifrar imagen",
@@ -617,12 +617,12 @@
     "Copied!": "¡Copiado!",
     "Failed to copy": "Falló la copia",
     "Add an Integration": "Añadir una Integración",
-    "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?": "Estás a punto de ir a un sitio de terceros de modo que pueda autenticar su cuenta para usarla con %(integrationsUrl)s. ¿Quieres continuar?",
+    "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?": "Estás a punto de ir a un sitio externo para que puedas iniciar sesión con tu cuenta y usarla en %(integrationsUrl)s. ¿Quieres seguir?",
     "An email has been sent to %(emailAddress)s": "Se envió un correo electrónico a %(emailAddress)s",
     "Please check your email to continue registration.": "Por favor consulta tu correo electrónico para continuar con el registro.",
     "Token incorrect": "Token incorrecto",
     "A text message has been sent to %(msisdn)s": "Se envió un mensaje de texto a %(msisdn)s",
-    "Please enter the code it contains:": "Por favor introduzca el código que contiene:",
+    "Please enter the code it contains:": "Por favor, escribe el código que contiene:",
     "Code": "Código",
     "The email field must not be blank.": "El campo de correo electrónico no debe estar en blanco.",
     "The phone number field must not be blank.": "El campo de número telefónico no debe estar en blanco.",
@@ -634,12 +634,12 @@
     "Failed to withdraw invitation": "Falló la retirada de la invitación",
     "Failed to remove user from community": "Falló la eliminación de este usuario de la comunidad",
     "Filter community members": "Filtrar miembros de la comunidad",
-    "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "¿Seguro que quieres eliminar a '%(roomName)s' de %(groupId)s?",
+    "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "¿Seguro que quieres eliminar a «%(roomName)s de %(groupId)s?",
     "Removing a room from the community will also remove it from the community page.": "Al eliminar una sala de la comunidad también se eliminará de su página.",
     "Failed to remove room from community": "Falló la eliminación de la sala de la comunidad",
-    "Failed to remove '%(roomName)s' from %(groupId)s": "Falló la eliminación de '%(roomName)s' de %(groupId)s",
-    "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "La visibilidad de '%(roomName)s' en %(groupId)s no se pudo actualizar.",
-    "Visibility in Room List": "Visibilidad en la Lista de Salas",
+    "Failed to remove '%(roomName)s' from %(groupId)s": "Ha fallado la eliminación de «%(roomName)s» de %(groupId)s",
+    "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "La visibilidad de «%(roomName)s» en %(groupId)s no se ha podido actualizar.",
+    "Visibility in Room List": "Visibilidad en la lista de salas",
     "Visible to everyone": "Visible a todo el mundo",
     "Only visible to community members": "Sólo visible a los miembros de la comunidad",
     "Filter community rooms": "Filtrar salas de la comunidad",
@@ -665,8 +665,8 @@
     "%(oneUser)sleft %(count)s times|one": "%(oneUser)s salió",
     "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s se unieron y fueron %(count)s veces",
     "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s se unieron y fueron",
-    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s se unió y fue %(count)s veces",
-    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s se unió y fue",
+    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s se unió y se fue %(count)s veces",
+    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s se unió y se fue",
     "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s se fueron y volvieron a unirse %(count)s veces",
     "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s se fueron y volvieron a unirse",
     "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s se fue y volvió a unirse %(count)s veces",
@@ -709,18 +709,18 @@
     "expand": "expandir",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "No se pudo cargar el evento al que se respondió, bien porque no existe o no tiene permiso para verlo.",
     "<a>In reply to</a> <pill>": "<a>En respuesta a </a> <pill>",
-    "And %(count)s more...|other": "Y %(count)s más...",
+    "And %(count)s more...|other": "Y %(count)s más…",
     "ex. @bob:example.com": "ej. @bob:ejemplo.com",
     "Add User": "Agregar Usuario",
     "Matrix ID": "ID de Matrix",
-    "Matrix Room ID": "ID de Sala de Matrix",
+    "Matrix Room ID": "ID de sala de Matrix",
     "email address": "dirección de correo electrónico",
     "You have entered an invalid address.": "No ha introducido una dirección correcta.",
     "Try using one of the following valid address types: %(validTypesList)s.": "Intente usar uno de los tipos de direcciones válidos: %(validTypesList)s.",
     "Confirm Removal": "Confirmar eliminación",
     "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.": "¿Seguro que quieres eliminar este evento? Ten en cuenta que, si borras un cambio de nombre o tema de sala, podrías deshacer el cambio.",
     "Community IDs cannot be empty.": "Las IDs de comunidad no pueden estar vacías.",
-    "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Las IDs de comunidad sólo pueden contener caracteres a-z, 0-9, ó '=_-./'",
+    "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Las IDs de comunidad solo pueden contener caracteres de la «a» a la «z» excluyendo la «ñ», dígitos o «=_-./»",
     "Something went wrong whilst creating your community": "Algo fue mal mientras se creaba la comunidad",
     "Create Community": "Crear Comunidad",
     "Community Name": "Nombre de Comunidad",
@@ -756,22 +756,22 @@
     "Collapse Reply Thread": "Colapsar Hilo de Respuestas",
     "There are no visible files in this room": "No hay archivos visibles en esta sala",
     "<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": "HTML para la página de tu comunidad. Usa la descripción larga para su presentación, o distribuir enlaces de interés. Puedes incluso usar etiquetas 'img'\n",
-    "Add rooms to the community summary": "Agregar salas al resumen de la comunidad",
-    "Which rooms would you like to add to this summary?": "¿Cuáles salas desea agregar a este resumen?",
-    "Add to summary": "Agregar a resumen",
+    "Add rooms to the community summary": "Añadir salas al resumen de la comunidad",
+    "Which rooms would you like to add to this summary?": "¿Cuáles salas quieres añadir a este resumen?",
+    "Add to summary": "Añadir al resumen",
     "Failed to add the following rooms to the summary of %(groupId)s:": "Falló la agregación de las salas siguientes al resumen de %(groupId)s:",
-    "Add a Room": "Agregar una Sala",
+    "Add a Room": "Añadir una sala",
     "Failed to remove the room from the summary of %(groupId)s": "Falló la eliminación de la sala del resumen de %(groupId)s",
-    "The room '%(roomName)s' could not be removed from the summary.": "La sala '%(roomName)s' no se pudo eliminar del resumen.",
-    "Add users to the community summary": "Agregar usuario al resumen de la comunidad",
-    "Who would you like to add to this summary?": "¿A quién le gustaría agregar a este resumen?",
+    "The room '%(roomName)s' could not be removed from the summary.": "La sala «%(roomName)s no se pudo eliminar del resumen.",
+    "Add users to the community summary": "Añadir usuario al resumen de la comunidad",
+    "Who would you like to add to this summary?": "¿A quién te gustaría añadir a este resumen?",
     "Failed to add the following users to the summary of %(groupId)s:": "Falló la adición de los usuarios siguientes al resumen de %(groupId)s:",
-    "Add a User": "Agregar un usuario",
+    "Add a User": "Añadir un usuario",
     "Failed to remove a user from the summary of %(groupId)s": "Falló la eliminación de un usuario del resumen de %(groupId)s",
-    "The user '%(displayName)s' could not be removed from the summary.": "No se pudo eliminar al usuario '%(displayName)s' del resumen.",
+    "The user '%(displayName)s' could not be removed from the summary.": "No se ha podido eliminar al usuario «%(displayName)s» del resumen.",
     "Failed to upload image": "No se pudo cargar la imagen",
     "Failed to update community": "Falló la actualización de la comunidad",
-    "Unable to accept invite": "No se pudo aceptar la invitación",
+    "Unable to accept invite": "No se ha podido aceptar la invitación",
     "Unable to join community": "No se pudo unir a comunidad",
     "Leave Community": "Salir de la Comunidad",
     "Leave %(groupName)s?": "¿Salir de %(groupName)s?",
@@ -810,7 +810,7 @@
     "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "No puedes enviar ningún mensaje hasta que revises y estés de acuerdo con <consentLink>nuestros términos y condiciones</consentLink>.",
     "%(count)s of your messages have not been sent.|one": "No se ha enviado tu mensaje.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Reenviar todo</resendText> o <cancelText>cancelar todo</cancelText> ahora. También puedes seleccionar mensajes individuales para reenviar o cancelar.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Reenviar mensaje</resendText> o <cancelText>cancelar mensaje</cancelText> ahora.",
+    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Reenviar mensaje</resendText> o <cancelText>cancelar el envío</cancelText> ahora.",
     "Connectivity to the server has been lost.": "Se ha perdido la conexión con el servidor.",
     "Sent messages will be stored until your connection has returned.": "Los mensajes enviados se almacenarán hasta que vuelva la conexión.",
     "Active call": "Llamada activa",
@@ -861,7 +861,7 @@
     "The room upgrade could not be completed": "La actualización de la sala no pudo ser completada",
     "Upgrade this room to version %(version)s": "Actualiza esta sala a la versión %(version)s",
     "Legal": "Legal",
-    "Unable to connect to Homeserver. Retrying...": "No ha sido posible conectarse al servidor base. Volviendo a intentar...",
+    "Unable to connect to Homeserver. Retrying...": "No ha sido posible conectarse al servidor base. Volviéndolo a intentar…",
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s estableció la dirección principal para esta sala como %(address)s.",
     "%(senderName)s removed the main address for this room.": "%(senderName)s eliminó la dirección principal para esta sala.",
     "%(brand)s now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!": "%(brand)s ahora utiliza de 3 a 5 veces menos memoria, porque solo carga información sobre otros usuarios cuando es necesario. Por favor, ¡aguarda mientras volvemos a sincronizar con el servidor!",
@@ -879,7 +879,7 @@
     "Phone numbers": "Números de teléfono",
     "Email addresses": "Correos electrónicos",
     "Language and region": "Idioma y región",
-    "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "El fichero %(fileName)s supera el tamaño límite del servidor para subidas",
+    "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "El archivo «%(fileName)s» supera el tamaño límite del servidor para subidas",
     "Unable to load! Check your network connectivity and try again.": "No se ha podido cargar. Comprueba tu conexión de red e inténtalo de nuevo.",
     "Failed to invite users to the room:": "Fallo al invitar usuarios a la sala:",
     "Upgrades a room to a new version": "Actualiza una sala a una nueva versión",
@@ -907,9 +907,9 @@
     "Capitalization doesn't help very much": "Las mayúsculas no ayudan mucho",
     "All-uppercase is almost as easy to guess as all-lowercase": "Todo en mayúsculas es tan inseguro como todo en minúsculas",
     "Reversed words aren't much harder to guess": "Las palabras al revés no son muy dificiles de adivinar",
-    "Predictable substitutions like '@' instead of 'a' don't help very much": "Sustituciones predecibles como ''@' en vez de 'a' no ayudan mucho",
+    "Predictable substitutions like '@' instead of 'a' don't help very much": "Sustituciones predecibles como «@ en vez de 'a' no ayudan mucho",
     "Add another word or two. Uncommon words are better.": "Añade una o dos palabras más. Palabras raras mejor.",
-    "Repeats like \"aaa\" are easy to guess": "Repetición como 'aaa' son muy fáciles de adivinar",
+    "Repeats like \"aaa\" are easy to guess": "Los caracteres repetidos como «aaa» son muy fáciles de adivinar",
     "Repeats like \"abcabcabc\" are only slightly harder to guess than \"abc\"": "Repeticiones como \"abcabcabc\" son solo ligeramente más difíciles de adivinar que \"abc\"",
     "Sequences like abc or 6543 are easy to guess": "Secuencias como abc or 6543 son faciles de adivinar",
     "Recent years are easy to guess": "Años recientes son fáciles de adivinar",
@@ -923,7 +923,7 @@
     "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 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",
+    "There was an error joining the room": "Ha ocurrido un error al unirse a la sala",
     "Custom user status messages": "Mensajes de estado de usuario personalizados",
     "Group & filter rooms by custom tags (refresh to apply changes)": "Agrupa y filtra salas por etiquetas personalizadas (refresca para aplicar cambios)",
     "Render simple counters in room header": "Muestra contadores simples en la cabecera de la sala",
@@ -936,7 +936,7 @@
     "Show avatars in user and room mentions": "Mostrar avatares en menciones a usuarios y salas",
     "Enable big emoji in chat": "Activar emojis grandes en el chat",
     "Send typing notifications": "Enviar notificaciones de tecleo",
-    "Allow Peer-to-Peer for 1:1 calls": "Permitir conexión de pares en llamadas individuales",
+    "Allow Peer-to-Peer for 1:1 calls": "Permitir conexiones «peer-to-peer en llamadas individuales",
     "Prompt before sending invites to potentially invalid matrix IDs": "Pedir confirmación antes de enviar invitaciones a IDs de matrix que parezcan inválidas",
     "Show developer tools": "Mostrar herramientas de desarrollador",
     "Messages containing my username": "Mensajes que contengan mi nombre",
@@ -979,7 +979,7 @@
     "Pizza": "Pizza",
     "Cake": "Tarta",
     "Heart": "Corazón",
-    "Smiley": "Sonriente",
+    "Smiley": "Emoticono",
     "Robot": "Robot",
     "Hat": "Sombrero",
     "Glasses": "Gafas",
@@ -1021,7 +1021,7 @@
     "Unable to load key backup status": "No se pudo cargar el estado de la copia de la clave",
     "Restore from Backup": "Restaurar desde copia",
     "Back up your keys before signing out to avoid losing them.": "Haz copia de tus claves antes de salir para evitar perderlas.",
-    "Backing up %(sessionsRemaining)s keys...": "Haciendo copia de %(sessionsRemaining)s claves...",
+    "Backing up %(sessionsRemaining)s keys...": "Haciendo copia de %(sessionsRemaining)s claves…",
     "All keys backed up": "Se han copiado todas las claves",
     "Backup version: ": "Versión de la copia: ",
     "Algorithm: ": "Algoritmo: ",
@@ -1032,11 +1032,11 @@
     "Phone Number": "Número de teléfono",
     "Profile picture": "Foto de perfil",
     "Display Name": "Nombre a mostrar",
-    "Internal room ID:": "ID de Sala Interna:",
+    "Internal room ID:": "ID de sala Interna:",
     "Open Devtools": "Abrir devtools",
     "General": "General",
     "Room Addresses": "Direcciones de sala",
-    "Set a new account password...": "Elegir una nueva contraseña para la cuenta...",
+    "Set a new account password...": "Cambiar la contraseña de tu cuenta…",
     "Account management": "Gestión de la cuenta",
     "Deactivating your account is a permanent action - be careful!": "Desactivar tu cuenta es permanente. ¡Cuidado!",
     "Credits": "Créditos",
@@ -1083,7 +1083,7 @@
     "Incompatible Database": "Base de datos incompatible",
     "Continue With Encryption Disabled": "Seguir con cifrado desactivado",
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Verifica a este usuario para marcarlo como de confianza. Confiar en usuarios aporta tranquilidad en los mensajes cifrados de extremo a extremo.",
-    "Waiting for partner to confirm...": "Esperando que confirme el compañero...",
+    "Waiting for partner to confirm...": "Esperando que confirme la otra parte…",
     "Incoming Verification Request": "Petición de verificación entrante",
     "%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s cambió la regla para unirse a %(rule)s",
     "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s cambió el acceso para invitados a %(rule)s",
@@ -1095,7 +1095,7 @@
     "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Uses o no las «migas de pan» (iconos sobre la lista de salas)",
     "Replying With Files": "Respondiendo con archivos",
     "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "En este momento no es posible responder con un archivo. ¿Te gustaría subir el archivo sin responder?",
-    "The file '%(fileName)s' failed to upload.": "La subida del archivo '%(fileName)s' ha fallado.",
+    "The file '%(fileName)s' failed to upload.": "La subida del archivo «%(fileName)s ha fallado.",
     "The server does not support the room version specified.": "El servidor no soporta la versión de sala especificada.",
     "Name or Matrix ID": "Nombre o ID de Matrix",
     "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Añade ¯\\_(ツ)_/¯ al principio de un mensaje de texto plano",
@@ -1151,11 +1151,11 @@
     "Add Phone Number": "Añadir número de teléfono",
     "Identity server has no terms of service": "El servidor de identidad no tiene términos de servicio",
     "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "Esta acción necesita acceder al servidor de identidad por defecto <server /> para validar un correo o un teléfono, pero el servidor no tiene términos de servicio.",
-    "Only continue if you trust the owner of the server.": "Continúe solamente si confía en el propietario del servidor.",
-    "Trust": "Confianza",
+    "Only continue if you trust the owner of the server.": "Continúa solamente si confías en el propietario del servidor.",
+    "Trust": "Confiar",
     "Custom (%(level)s)": "Personalizado (%(level)s)",
     "Error upgrading room": "Fallo al mejorar la sala",
-    "Double check that your server supports the room version chosen and try again.": "Asegúrese de que su servidor soporta la versión de sala elegida y pruebe otra vez.",
+    "Double check that your server supports the room version chosen and try again.": "Asegúrate de que tu servidor es compatible con la versión de sala elegida y prueba de nuevo.",
     "%(senderName)s placed a voice call.": "%(senderName)s hizo una llamada de voz.",
     "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s hizo una llamada de voz. (no soportada por este navegador)",
     "%(senderName)s placed a video call.": "%(senderName)s hizo una llamada de vídeo.",
@@ -1168,10 +1168,10 @@
     "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/o servidores que has bloqueado. ¡No te salgas de la sala!",
     "Decline (%(counter)s)": "Declinar (%(counter)s)",
-    "Accept <policyLink /> to continue:": "Aceptar <policyLink /> para continuar:",
+    "Accept <policyLink /> to continue:": "<policyLink />, acepta para continuar:",
     "ID": "ID",
     "Public Name": "Nombre público",
-    "Connecting to integration manager...": "Conectando al gestor de integraciones...",
+    "Connecting to integration manager...": "Conectando al gestor de integraciones…",
     "Cannot connect to integration manager": "No se puede conectar al gestor de integraciones",
     "The integration manager is offline or it cannot reach your homeserver.": "El gestor de integraciones está desconectado o no puede conectar con su servidor.",
     "%(count)s unread messages including mentions.|other": "%(count)s mensajes sin leer incluyendo menciones.",
@@ -1184,7 +1184,7 @@
     "You have %(count)s unread notifications in a prior version of this room.|other": "Tiene %(count)s notificaciones sin leer en una versión anterior de esta sala.",
     "You have %(count)s unread notifications in a prior version of this room.|one": "Tiene %(count)s notificaciones sin leer en una versión anterior de esta sala.",
     "Setting up keys": "Configurando claves",
-    "Verify this session": "Verificar esta sesión",
+    "Verify this session": "Verifica esta sesión",
     "Encryption upgrade available": "Mejora de cifrado disponible",
     "Set up encryption": "Configurar la encriptación",
     "Verifies a user, session, and pubkey tuple": "Verifica a un usuario, sesión y tupla de clave pública",
@@ -1246,9 +1246,9 @@
     "Are you sure you want to sign out?": "¿Estás seguro de que quieres salir?",
     "Message edits": "Ediciones del mensaje",
     "New session": "Nueva sesión",
-    "Use this session to verify your new one, granting it access to encrypted messages:": "Usa esta sesión para verificar la nueva, dándole acceso a mensajes cifrados:",
+    "Use this session to verify your new one, granting it access to encrypted messages:": "Usa esta sesión para verificar la nueva, dándole acceso a los mensajes cifrados:",
     "If you didn’t sign in to this session, your account may be compromised.": "Si no te conectaste a esta sesión, es posible que tu cuenta haya sido comprometida.",
-    "This wasn't me": "No fui yo",
+    "This wasn't me": "No he sido yo",
     "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "Si encuentras algún error o quieres compartir una opinión, por favor, contacta con nosotros en GitHub.",
     "Report bugs & give feedback": "Reportar errores y compartir mi opinión",
     "Please fill why you're reporting.": "Por favor, explica por qué estás reportando.",
@@ -1274,7 +1274,7 @@
     "Be found by phone or email": "Ser encontrado por teléfono o email",
     "Use bots, bridges, widgets and sticker packs": "Usar robots, puentes, widgets, o packs de pegatinas",
     "Terms of Service": "Términos de servicio",
-    "To continue you need to accept the terms of this service.": "Para continuar necesitas aceptar estos términos de servicio.",
+    "To continue you need to accept the terms of this service.": "Para continuar, necesitas aceptar estos términos de servicio.",
     "Service": "Servicio",
     "Summary": "Resumen",
     "Document": "Documento",
@@ -1293,7 +1293,7 @@
     "Remember my selection for this widget": "Recordar mi selección para este widget",
     "Deny": "Rechazar",
     "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Tu contraseña ha sido cambiada satisfactoriamente. No recibirás notificaciones push en otras sesiones hasta que te conectes de nuevo a ellas",
-    "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Aceptar los Términos de Servicio del servidor de identidad %(serverName)s para poder ser descubierto por dirección de email o número de teléfono.",
+    "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Acepta los términos de servicio del servidor de identidad %(serverName)s para poder ser encontrado por dirección de correo electrónico o número de teléfono.",
     "Discovery": "Descubrimiento",
     "Deactivate account": "Desactivar cuenta",
     "Clear cache and reload": "Limpiar caché y recargar",
@@ -1314,7 +1314,7 @@
     "⚠ These settings are meant for advanced users.": "⚠ Estas opciones son indicadas para usuarios avanzados.",
     "Personal ban list": "Lista de bloqueo personal",
     "Server or user ID to ignore": "Servidor o ID de usuario a ignorar",
-    "eg: @bot:* or example.org": "p. ej.: @bot:* o ejemplo.org",
+    "eg: @bot:* or example.org": "ej.: @bot:* o ejemplo.org",
     "Your user agent": "Tu agente de usuario",
     "If you cancel now, you won't complete verifying the other user.": "Si cancelas ahora, no completarás la verificación del otro usuario.",
     "If you cancel now, you won't complete verifying your other session.": "Si cancelas ahora, no completarás la verificación de tu otra sesión.",
@@ -1350,12 +1350,12 @@
     "Never send encrypted messages to unverified sessions in this room from this session": "No enviar nunca mensajes cifrados a sesiones sin verificar en esta sala desde esta sesión",
     "Enable message search in encrypted rooms": "Activar la búsqueda de mensajes en salas cifradas",
     "How fast should messages be downloaded.": "Con qué rapidez deben ser descargados los mensajes.",
-    "Verify this session by completing one of the following:": "Verifica esta sesión completando uno de los siguientes:",
+    "Verify this session by completing one of the following:": "Verifica esta sesión de una de las siguientes formas:",
     "Scan this unique code": "Escanea este código único",
     "or": "o",
-    "Compare unique emoji": "Comparar emoji único",
-    "Compare a unique set of emoji if you don't have a camera on either device": "Comparar un conjunto de emojis si no tienes cámara en ninguno de los dispositivos",
-    "Start": "Inicio",
+    "Compare unique emoji": "Comparar iconos",
+    "Compare a unique set of emoji if you don't have a camera on either device": "Comparar un conjunto de iconos si no tienes cámara en ninguno de los dispositivos",
+    "Start": "Empezar",
     "Waiting for %(displayName)s to verify…": "Esperando la verificación de %(displayName)s…",
     "Review": "Revise",
     "in secret storage": "en almacén secreto",
@@ -1472,9 +1472,9 @@
     "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 tu servidor base no lo ofrezca (tu 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)",
     "Manually verify all remote sessions": "Verificar 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:",
+    "Confirm the emoji below are displayed on both sessions, in the same order:": "Confirma que los iconos de abajo se muestran en el mismo orden en ambas sesiones:",
     "Verify this session by confirming the following number appears on its screen.": "Verifica 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…",
+    "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Esperando a que la otra sesión lo verifique también %(deviceName)s (%(deviceId)s)…",
     "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",
     "Set up": "Configurar",
@@ -1515,12 +1515,12 @@
     "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",
-    "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 <validity>valid</validity> signature from this user": "La copia de seguridad tiene una firma <validity>válida</validity> de este usuario",
+    "Backup has a <validity>invalid</validity> signature from this user": "La copia de seguridad tiene una firma <validity>inválida</validity> de este usuario",
+    "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "La copia de seguridad tiene una firma <verify>desconocida</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 an <validity>invalid</validity> signature from this session": "La copia de seguridad tiene una firma <validity>invá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>",
@@ -1574,7 +1574,7 @@
     "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",
+    "Reset": "Restablecer",
     "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.": "Haz clic en el enlace del correo electrónico para verificar, y luego nuevamente haz clic en continuar.",
@@ -1585,7 +1585,7 @@
     "Please enter verification code sent via text.": "Por favor, introduce el código de verificación enviado por SMS.",
     "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.",
+    "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, escribe 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.",
@@ -1609,9 +1609,9 @@
     "e.g. my-room": "p.ej. mi-sala",
     "Some characters not allowed": "Algunos caracteres no están permitidos",
     "Sign in with single sign-on": "Ingresar con un Registro Único",
-    "Enter a server name": "Introduzca un nombre de servidor",
+    "Enter a server name": "Introduce 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",
+    "Can't find this server or its room list": "No se ha podido 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 eliminar <b>%(serverName)s</b>?",
@@ -1620,15 +1620,15 @@
     "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 ...",
+    "Add a new server...": "Añadir otro 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>. Usar (%(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.",
+    "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Por favor, cuéntanos qué ha ido mal o, mejor aún, cree una incidencia en 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",
+    "GitHub issue": "Incidencia de 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…",
@@ -1638,14 +1638,14 @@
     "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 cifrados 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",
+    "Please enter a name for the room": "Elige un nombre para la sala",
     "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": "Activar el cifrado de extremo a extremo",
     "You can’t disable this later. Bridges & most bots won’t work yet.": "No puedes desactivar 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 privada",
     "Topic (optional)": "Tema (opcional)",
-    "Make this room public": "Haz la sala pública",
+    "Make this room public": "Hacer la sala pública",
     "Hide advanced": "Ocultar ajustes avanzados",
     "Show advanced": "Mostrar ajustes avanzados",
     "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!)",
@@ -1692,7 +1692,7 @@
     "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.",
-    "Join the discussion": "Unirse a la sala",
+    "Join the discussion": "Unirme a la Sala",
     "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?",
     "<userName/> invited you": "<userName/> te ha invitado",
@@ -1746,8 +1746,8 @@
     "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 base como <i>inestable</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.",
+    "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "Puedes usar <code>/help</code> para ver los comandos disponibles. ¿Querías enviarlo como mensaje?",
+    "Hint: Begin your message with <code>//</code> to start it with a slash.": "Sugerencia: empieza 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",
@@ -1760,7 +1760,7 @@
     "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.",
     "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 dirección local.",
+    "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. Para publicar una dirección, primero hay que añadirla como dirección local.",
     "Other published addresses:": "Otras direcciones publicadas:",
     "No other published addresses yet, add one below": "Todavía no hay direcciones publicadas, puedes añadir una más abajo",
     "New published address (e.g. #alias:server)": "Nueva dirección publicada (p.ej.. #alias:server)",
@@ -1806,7 +1806,7 @@
     "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 cifrar, verificar a todos los usuarios para asegurarse de son seguras.",
-    "You've successfully verified %(deviceName)s (%(deviceId)s)!": "¡Has verificado con éxito los %(deviceName)s (%(deviceId)s)!",
+    "You've successfully verified %(deviceName)s (%(deviceId)s)!": "Has verificado con éxito %(deviceName)s (%(deviceId)s)",
     "You've successfully verified %(displayName)s!": "¡Has verificado con éxito a %(displayName)s!",
     "Verified": "Verificado",
     "Got it": "Aceptar",
@@ -1825,7 +1825,7 @@
     "React": "Reaccionar",
     "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 have ignored this user, so their message is hidden. <a>Show anyways.</a>": "Ha ignorado a esta cuenta, así que su mensaje está oculto. <a>Ver de todos modos.</a>",
     "You verified %(name)s": "Has verificado a %(name)s",
     "You cancelled verifying %(name)s": "Has cancelado la verificación de %(name)s",
     "%(name)s cancelled verifying": "%(name)s canceló la verificación",
@@ -1847,7 +1847,7 @@
     "Message deleted by %(name)s": "Mensaje eliminado por %(name)s",
     "Edited at %(date)s. Click to view edits.": "Editado el día %(date)s. Haz clic para ver las ediciones.",
     "edited": "editado",
-    "Can't load this message": "No puedo cargar este mensaje",
+    "Can't load this message": "No se ha podido cargar este mensaje",
     "Submit logs": "Enviar registros",
     "Frequently Used": "Frecuente",
     "Smileys & People": "Caritas y personas",
@@ -1866,7 +1866,7 @@
     "Your user ID": "Tu ID de usuario",
     "Your theme": "Su tema",
     "%(brand)s URL": "URL de %(brand)s",
-    "Room ID": "Identidad (ID) de la sala",
+    "Room ID": "ID de la sala",
     "Widget ID": "ID del widget",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Usar este widget puede resultar en que se compartan 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 que se compartan datos <helpIcon /> con %(widgetDomain)s.",
@@ -1881,7 +1881,7 @@
     "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ó",
+    "Signature upload failed": "Subida de firma ha fallado",
     "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:": "Confirma la sesión de este usuario comparando lo siguiente con su configuración:",
     "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.",
@@ -1892,7 +1892,7 @@
     "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 tu servidor base. Si los mensajes en esta sala están cifrados, el administrador de tu servidor no podrá leer el texto del mensaje ni ver ningún archivo o imagen.",
+    "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 tu servidor base. Si los mensajes en esta sala están cifrados, 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",
     "Verify other session": "Verificar otra sesión",
@@ -1904,7 +1904,7 @@
     "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",
     "Restoring keys from backup": "Restaurando las claves desde copia de seguridad",
-    "Fetching keys from server...": "Obteniendo las claves desde el servidor...",
+    "Fetching keys from server...": "Obteniendo las claves desde el servido…",
     "%(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",
@@ -1931,7 +1931,7 @@
     "Clear status": "Borrar estado",
     "Update status": "Actualizar estado",
     "Set status": "Cambiar estado",
-    "Set a new status...": "Elegir un estado nuevo...",
+    "Set a new status...": "Elegir un nuevo estado…",
     "Hide": "Ocultar",
     "Help": "Ayuda",
     "Reload": "Recargar",
@@ -1954,12 +1954,12 @@
     "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)",
+    "Enter email address (required on this homeserver)": "Introduce una dirección de correo electrónico (obligatorio 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",
+    "Enter password": "Escribe tu 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...",
+    "Keep going...": "Continuar…",
     "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)": "Introduce un número de teléfono (es obligatorio en este servidor base)",
@@ -1986,15 +1986,15 @@
     "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",
+    "Couldn't load page": "No se ha podido cargar la página",
     "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Eres 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 base no permite las comunidades",
     "Welcome to %(appName)s": "Te damos la bienvenida a %(appName)s",
     "Liberate your communication": "Libera tu 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 Public Rooms": "Explora las salas públicas",
+    "Create a Group Chat": "Crea un chat grupal",
     "Explore": "Explorar",
     "Filter": "Filtrar",
     "Filter rooms…": "Filtrar salas…",
@@ -2020,7 +2020,7 @@
     "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",
+    "Sign in instead": "Iniciar sesión",
     "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.",
@@ -2038,7 +2038,7 @@
     "Room name or address": "Nombre o dirección de la sala",
     "Address (optional)": "Dirección (opcional)",
     "Help us improve %(brand)s": "Ayúdanos a mejorar %(brand)s",
-    "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "Enviar <UsageDataLink>información anónima de uso</UsageDataLink> nos ayudaría bastante a mejorar %(brand)s. Esto cuenta como utilizar <PolicyLink>una cookie</PolicyLink>.",
+    "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "Enviar <UsageDataLink>información anónima de uso</UsageDataLink> nos ayuda a mejorar %(brand)s. Esto usará <PolicyLink>una cookie</PolicyLink>.",
     "I want to help": "Quiero ayudar",
     "Ok": "Ok",
     "Set password": "Establecer contraseña",
@@ -2102,7 +2102,7 @@
     "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.": "Prototipo de comunidades v2. Requiere un servidor compatible. Altamente experimental - usar con precuación.",
     "Font size": "Tamaño del texto",
     "Use custom size": "Usar un tamaño personalizado",
-    "Use a more compact ‘Modern’ layout": "Usar un diseño más 'moderno' y compacto",
+    "Use a more compact ‘Modern’ layout": "Usar un diseño más «moderno y compacto",
     "Use a system font": "Usar una fuente del sistema",
     "System font name": "Nombre de la fuente",
     "Enable experimental, compact IRC style layout": "Activar el diseño experimental de IRC compacto",
@@ -2115,7 +2115,7 @@
     "Your server isn't responding to some <a>requests</a>.": "Tú servidor no esta respondiendo a ciertas <a>solicitudes</a>.",
     "There are advanced notifications which are not shown here.": "Hay configuraciones avanzadas que no se muestran aquí.",
     "You might have configured them in a client other than %(brand)s. You cannot tune them in %(brand)s but they still apply.": "Puede que las hayas configurado en otro cliente además de %(brand)s. No puedes cambiarlas en %(brand)s pero sus efectos siguen aplicándose.",
-    "New version available. <a>Update now.</a>": "Nueva versión disponible. <a>Actualiza ahora.</a>",
+    "New version available. <a>Update now.</a>": "Nueva versión disponible. <a>Actualizar ahora.</a>",
     "Hey you. You're the best!": "Oye, tú. ¡Eres genial!",
     "Size must be a number": "El tamaño debe ser un dígito",
     "Custom font size can only be between %(min)s pt and %(max)s pt": "El tamaño de la fuente solo puede estar entre los valores %(min)s y %(max)s",
@@ -2123,7 +2123,7 @@
     "Message layout": "Diseño del mensaje",
     "Compact": "Compacto",
     "Modern": "Moderno",
-    "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "Introduce el nombre de la fuente instalada en tu sistema y %(brand)s intentará utilizarla.",
+    "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "Escribe el nombre de la fuente instalada en tu sistema y %(brand)s intentará usarla.",
     "Customise your appearance": "Personaliza la apariencia",
     "Appearance Settings only affect this %(brand)s session.": "Cambiar las opciones de apariencia solo afecta a esta sesión de %(brand)s.",
     "Please verify the room ID or address and try again.": "Por favor, verifica la ID o dirección de esta sala e inténtalo de nuevo.",
@@ -2150,7 +2150,7 @@
     "Cross-signing is ready for use.": "La firma cruzada está lista para su uso.",
     "Cross-signing is not set up.": "La firma cruzada no está configurada.",
     "Master private key:": "Clave privada maestra:",
-    "%(brand)s can't securely cache encrypted messages locally while running in a web browser. Use <desktopLink>%(brand)s Desktop</desktopLink> for encrypted messages to appear in search results.": "%(brand)s no puede almacenar en caché de forma segura mensajes cifrados localmente mientras se ejecuta en un navegador web. Utilizar <desktopLink> %(brand)s Escritorio</desktopLink> para que los mensajes cifrados aparezcan en los resultados de búsqueda.",
+    "%(brand)s can't securely cache encrypted messages locally while running in a web browser. Use <desktopLink>%(brand)s Desktop</desktopLink> for encrypted messages to appear in search results.": "%(brand)s no puede almacenar en caché de forma segura mensajes cifrados localmente mientras se ejecuta en un navegador web. Usa <desktopLink> %(brand)s Escritorio</desktopLink> para que los mensajes cifrados aparezcan en los resultados de búsqueda.",
     "Backup version:": "Versión de respaldo:",
     "Algorithm:": "Algoritmo:",
     "Back up your encryption keys with your account data in case you lose access to your sessions. Your keys will be secured with a unique Recovery Key.": "Haga una copia de seguridad de sus claves de cifrado con los datos de su cuenta en caso de que pierda el acceso a sus sesiones. Sus claves estarán protegidas con una clave de recuperación única.",
@@ -2214,7 +2214,7 @@
     "This address is already in use": "Esta dirección ya está en uso",
     "Preparing to download logs": "Preparándose para descargar registros",
     "Download logs": "Descargar registros",
-    "Add another email": "Agregar otro correo electrónico",
+    "Add another email": "Añadir otro correo electrónico",
     "People you know on %(brand)s": "Gente que conoces %(brand)s",
     "Show": "Mostrar",
     "Send %(count)s invites|other": "Enviar %(count)s invitaciones",
@@ -2226,10 +2226,10 @@
     "You can change this later if needed.": "Puede cambiar esto más tarde si es necesario.",
     "What's the name of your community or team?": "¿Cuál es el nombre de tu comunidad o equipo?",
     "Enter name": "Introduce un nombre",
-    "Add image (optional)": "Agregar imagen (opcional)",
+    "Add image (optional)": "Añadir imagen (opcional)",
     "An image will help people identify your community.": "Una imagen ayudará a las personas a identificar su comunidad.",
-    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone.": "Las salas privadas se pueden encontrar y unirse solo con invitación. Cualquier persona puede encontrar y unirse a las salas públicas.",
-    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone in this community.": "Las salas privadas se pueden encontrar y unirse solo con invitación. Cualquier persona de esta comunidad puede encontrar salas públicas y unirse a ellas.",
+    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone.": "Las salas privadas solo se pueden encontrar y unirse con invitación. Cualquier persona puede encontrar y unirse a las salas públicas.",
+    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone in this community.": "Las salas privadas solo se pueden encontrar y unirse con invitación. Cualquier persona de esta comunidad puede encontrar salas públicas y unirse a ellas.",
     "You might enable this if the room will only be used for collaborating with internal teams on your homeserver. This cannot be changed later.": "Puedes activar esto si la sala solo se usará para colaborar con equipos internos en tu servidor base. No se puede cambiar después.",
     "You might disable this if the room will be used for collaborating with external teams who have their own homeserver. This cannot be changed later.": "Puedes desactivar esto si la sala se utilizará para colaborar con equipos externos que tengan su propio servidor base. Esto no se puede cambiar después.",
     "Create a room in %(communityName)s": "Crea una sala en %(communityName)s",
@@ -2243,7 +2243,7 @@
     "May include members not in %(communityName)s": "Puede incluir miembros que no están en %(communityName)s",
     "Start a conversation with someone using their name, username (like <userId/>) or email address. This won't invite them to %(communityName)s. To invite someone to %(communityName)s, click <a>here</a>.": "Inicie una conversación con alguien usando su nombre, nombre de usuario (como<userId/>) o dirección de correo electrónico. Esto no los invitará a %(communityName)s Para invitar a alguien a %(communityName)s, haga clic <a>aquí</a>.",
     "You're all caught up.": "Estás al día.",
-    "Server isn't responding": "El servidor no responde",
+    "Server isn't responding": "El servidor no está respondiendo",
     "Your server isn't responding to some of your requests. Below are some of the most likely reasons.": "Su servidor no responde a algunas de sus solicitudes. A continuación se presentan algunas de las razones más probables.",
     "The server (%(serverName)s) took too long to respond.": "El servidor (%(serverName)s) tardó demasiado en responder.",
     "Your firewall or anti-virus is blocking the request.": "Tu firewall o antivirus está bloqueando la solicitud.",
@@ -2283,15 +2283,15 @@
     "Feedback": "Realimentación",
     "Community settings": "Configuración de la comunidad",
     "User settings": "Ajustes de usuario",
-    "Switch to light mode": "Cambiar al modo claro",
+    "Switch to light mode": "Cambiar al tema claro",
     "Switch to dark mode": "Cambiar al tema oscuro",
     "Switch theme": "Cambiar tema",
     "User menu": "Menú del Usuario",
     "Community and user menu": "Menú de comunidad y usuario",
     "Failed to perform homeserver discovery": "No se ha podido realizar el descubrimiento del servidor base",
-    "Syncing...": "Sincronizando ...",
-    "Signing In...": "Iniciando sesión...",
-    "If you've joined lots of rooms, this might take a while": "Si se ha unido a muchas salas, esto puede llevar un tiempo",
+    "Syncing...": "Sincronizando…",
+    "Signing In...": "Iniciando sesión…",
+    "If you've joined lots of rooms, this might take a while": "Si te has unido a muchas salas, esto puede llevar un tiempo",
     "Create account": "Crear una cuenta",
     "Unable to query for supported registration methods.": "No se pueden consultar los métodos de registro admitidos.",
     "Registration has been disabled on this homeserver.": "Se han desactivado los registros en este servidor base.",
@@ -2345,7 +2345,7 @@
     "Great! This recovery passphrase looks strong enough.": "¡Excelente! Esta frase de contraseña de recuperación parece lo suficientemente sólida.",
     "That matches!": "¡Eso combina!",
     "Use a different passphrase?": "¿Utiliza una frase de contraseña diferente?",
-    "That doesn't match.": "Eso no coincide.",
+    "That doesn't match.": "No coincide.",
     "Go back to set it again.": "Regrese para configurarlo nuevamente.",
     "Enter your recovery passphrase a second time to confirm it.": "Ingrese su contraseña de recuperación por segunda vez para confirmarla.",
     "Confirm your recovery passphrase": "Confirma tu contraseña de recuperación",
@@ -2379,7 +2379,7 @@
     "Set up Secure Message Recovery": "Configurar la recuperación segura de mensajes",
     "Secure your backup with a recovery passphrase": "Asegure su copia de seguridad con una frase de contraseña de recuperación",
     "Make a copy of your recovery key": "Haz una copia de tu clave de recuperación",
-    "Starting backup...": "Iniciando copia de seguridad ...",
+    "Starting backup...": "Empezando copia de seguridad…",
     "Success!": "¡Éxito!",
     "Create key backup": "Crear copia de seguridad de claves",
     "Unable to create key backup": "No se puede crear una copia de seguridad de la clave",
@@ -2416,9 +2416,9 @@
     "Ctrl": "Ctrl",
     "Toggle Bold": "Alternar negrita",
     "Toggle Italics": "Alternar cursiva",
-    "Toggle Quote": "Alternar Entrecomillar",
+    "Toggle Quote": "Alternar cita",
     "New line": "Nueva línea",
-    "Navigate recent messages to edit": "Navegar por mensajes recientes para editar",
+    "Navigate recent messages to edit": "Navegar entre mensajes recientes para editar",
     "Jump to start/end of the composer": "Saltar al inicio o final del editor",
     "Navigate composer history": "Navegar por el historial del editor",
     "Cancel replying to a message": "Cancelar la respuesta a un mensaje",
@@ -2428,14 +2428,14 @@
     "Dismiss read marker and jump to bottom": "Descartar el marcador de lectura y saltar al final",
     "Jump to oldest unread message": "Ir al mensaje no leído más antiguo",
     "Upload a file": "Cargar un archivo",
-    "Jump to room search": "Ir a la búsqueda de Salas",
+    "Jump to room search": "Ir a la búsqueda de salas",
     "Navigate up/down in the room list": "Navegar hacia arriba/abajo en la lista de salas",
     "Select room from the room list": "Seleccionar sala de la lista de salas",
     "Collapse room list section": "Contraer la sección de lista de salas",
     "Expand room list section": "Expandir la sección de la lista de salas",
     "Clear room list filter field": "Borrar campo de filtro de lista de salas",
-    "Previous/next unread room or DM": "Sala o DM anterior/siguiente sin leer",
-    "Previous/next room or DM": "Sala anterior/siguiente o DM",
+    "Previous/next unread room or DM": "Sala o mensaje directo anterior/siguiente sin leer",
+    "Previous/next room or DM": "Sala anterior/siguiente o mensaje directo",
     "Toggle the top left menu": "Alternar el menú superior izquierdo",
     "Close dialog or context menu": "Cerrar cuadro de diálogo o menú contextual",
     "Activate selected button": "Activar botón seleccionado",
@@ -2499,7 +2499,7 @@
     "Great, that'll help people know it's you": "Genial, ayudará a que la gente sepa que eres tú",
     "%(ssoButtons)s Or %(usernamePassword)s": "%(ssoButtons)s o %(usernamePassword)s",
     "Please enter your Security Phrase a second time to confirm.": "Por favor, escribe tu frase de seguridad una segunda vez para confirmarla.",
-    "Repeat your Security Phrase...": "Repite tu frase de seguridad...",
+    "Repeat your Security Phrase...": "Repite tu frase de seguridad…",
     "Your Security Key": "Tu clave de seguridad",
     "Your Security Key has been <b>copied to your clipboard</b>, paste it to:": "Tu clave de seguridad ha sido <b>copiada a tu portapapeles</b>, pégala en:",
     "Your Security Key is in your <b>Downloads</b> folder.": "Tu clave de seguridad está en tu carpeta de <b>Descargas</b>.",
@@ -2508,7 +2508,7 @@
     "Make a copy of your Security Key": "Haz una copia de tu clave de seguridad",
     "A new Security Phrase and key for Secure Messages have been detected.": "Se ha detectado una nueva frase de seguridad y clave para mensajes seguros.",
     "This session has detected that your Security Phrase and key for Secure Messages have been removed.": "Esta sesión ha detectado que tu frase de seguridad y clave para mensajes seguros ha sido eliminada.",
-    "Search (must be enabled)": "Buscar (debe estar activado)",
+    "Search (must be enabled)": "Buscar (si está activado)",
     "Zimbabwe": "Zimbabue",
     "Yemen": "Yemen",
     "Wallis & Futuna": "Wallis y Futuna",
@@ -2573,7 +2573,7 @@
     "Slovenia": "Eslovenia",
     "Slovakia": "Eslovaquia",
     "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Element with an existing Matrix account on a different homeserver.": "Puedes usar la opción de editar el servidor para iniciar sesión en otros servidores de Matrix indicando una URL de servidor base diferente. Esto te permitirá usar Element con una cuenta de Matrix que ye exista en un servidor base diferente.",
-    "We call the places where you can host your account ‘homeservers’.": "Llamamos a los sitios donde puedes alojar tu cuenta «servidores base».",
+    "We call the places where you can host your account ‘homeservers’.": "Llamamos «servidores base» a los sitios donde puedes alojar tu cuenta.",
     "Use email to optionally be discoverable by existing contacts.": "También puedes usarlo para que tus contactos te encuentren fácilmente.",
     "Add an email to be able to reset your password.": "Añade un correo para poder restablecer tu contraseña si te olvidas.",
     "Continue with %(ssoButtons)s": "Continuar con %(ssoButtons)s",
@@ -2693,7 +2693,7 @@
     "New here? <a>Create an account</a>": "¿Primera vez? <a>Crea una cuenta</a>",
     "Got an account? <a>Sign in</a>": "¿Ya tienes una cuenta? <a>Iniciar sesión</a>",
     "Filter rooms and people": "Filtrar salas y personas",
-    "You have no visible notifications.": "No tienes notificaciones visibles.",
+    "You have no visible notifications.": "No tienes notificaciones pendientes.",
     "%(creator)s created this DM.": "%(creator)s creó este mensaje directo.",
     "You do not have permission to create rooms in this community.": "No tienes permisos para crear salas en esta comunidad.",
     "Cannot create rooms in this community": "No puedes crear salas en esta comunidad",
@@ -2727,8 +2727,8 @@
     "Learn more": "Más información",
     "Use your preferred Matrix homeserver if you have one, or host your own.": "Usa tu servidor base de Matrix de confianza o aloja el tuyo propio.",
     "Other homeserver": "Otro servidor base",
-    "Sign into your homeserver": "Iniciar sesión en tu servidor base",
-    "Matrix.org is the biggest public homeserver in the world, so it’s a good place for many.": "Matrix.org es el mayor servidor base del mundo, por lo que es un buen sitio para muchos.",
+    "Sign into your homeserver": "Inicia sesión en tu servidor base",
+    "Matrix.org is the biggest public homeserver in the world, so it’s a good place for many.": "Matrix.org es el mayor servidor base del mundo, por lo que es un buen sitio para empezar.",
     "Specify a homeserver": "Especificar un servidor base",
     "Invalid URL": "URL inválida",
     "Unable to validate homeserver": "No se ha podido validar el servidor base",
@@ -2963,7 +2963,7 @@
     "Unable to access secret storage. Please verify that you entered the correct Security Phrase.": "No se ha podido acceder al almacenamiento seguro. Por favor, comprueba que la frase de seguridad es correcta.",
     "Just a heads up, if you don't add an email and forget your password, you could <b>permanently lose access to your account</b>.": "Ten en cuenta que, si no añades un correo electrónico y olvidas tu contraseña, podrías <b>perder accceso para siempre a tu cuenta</b>.",
     "We recommend you change your password and Security Key in Settings immediately": "Te recomendamos que cambies tu contraseña y clave de seguridad en ajustes inmediatamente",
-    "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.": "Invitar a alguien usando su nombre, dirección de correo, nombre de usuario (ej.: <userId/>) o <a>compartiendo esta sala</a>.",
+    "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.": "Invitar a alguien usando su nombre, dirección de correo, nombre de usuario (ej.: <userId/>) o <a>compartiendo la sala</a>.",
     "This won't invite them to %(communityName)s. To invite someone to %(communityName)s, click <a>here</a>": "Esto no les invitará a %(communityName)s. Para invitar a alguien a %(communityName)s, haz clic <a>aquí</a>",
     "Continuing temporarily allows the %(hostSignupBrand)s setup process to access your account to fetch verified email addresses. This data is not stored.": "Al continuar con el proceso de configuración, %(hostSignupBrand)s podrá acceder a tu cuenta para comprobar las direcciones de correo verificadas. Los datos no se almacenan.",
     "Failed to connect to your homeserver. Please close this dialog and try again.": "No se ha podido conectar con tu servidor base. Por favor, cierra este mensaje e inténtalo de nuevo.",
@@ -3026,5 +3026,120 @@
     "Settings Explorer": "Explorador de ajustes",
     "Windows": "Ventanas",
     "Share your screen": "Compartir pantalla",
-    "Screens": "Pantallas"
+    "Screens": "Pantallas",
+    "Inviting...": "Invitando…",
+    "Creating rooms...": "Creando salas…",
+    "Find a room...": "Encontrar una sala…",
+    "Saving...": "Guardando…",
+    "Applying...": "Aplicando…",
+    "Encrypting your message...": "Cifrando tu mensaje…",
+    "Sending your message...": "Enviando tu mensaje…",
+    "Creating...": "Creando…",
+    "Promoted to users": "Ascendidos a usuarios",
+    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the space it will be impossible to regain privileges.": "No podrás deshacer esto, ya que te estás quitando tus permisos. Si eres la última persona con permisos en este usuario, no será posible recuperarlos.",
+    "Jump to the bottom of the timeline when you send a message": "Saltar abajo del todo cuando envíes un mensaje",
+    "Your private space <name/>": "Tu espacio privado <name/>",
+    "Welcome to <name/>": "Te damos la bienvenida a <name/>",
+    "Already in call": "Ya en una llamada",
+    "Original event source": "Fuente original del evento",
+    "Decrypted event source": "Descifrar fuente del evento",
+    "We'll create rooms for each of them. You can add existing rooms after setup.": "Crearemos salas para cada uno de ellos. Puedes añadir salas ya existentes después de la configuración.",
+    "What projects are you working on?": "¿En qué proyectos estáis trabajando?",
+    "We'll create rooms for each topic.": "Crearemos una sala para cada tema.",
+    "What are some things you want to discuss?": "¿De qué cosas quieres hablar?",
+    "Invite by username": "Invitar por nombre de usuario",
+    "Invite your teammates": "Invita a tu equipo",
+    "Failed to invite the following users to your space: %(csvUsers)s": "La invitación a este espacio de los siguientes usuarios ha fallado: %(csvUsers)s",
+    "A private space for you and your teammates": "Un espacio privado para ti y tu equipo",
+    "Me and my teammates": "Yo y mi equipo",
+    "A private space just for you": "Un espacio privado solo para ti",
+    "Just Me": "Solo yo",
+    "Ensure the right people have access to the space.": "Asegúrate de que las personas adecuadas tienen acceso a este espacio.",
+    "Who are you working with?": "¿Con quién estás trabajando?",
+    "Finish": "Terminar",
+    "At the moment only you can see it.": "En este momento solo tú lo puedes ver.",
+    "Skip for now": "Omitir por ahora",
+    "Failed to create initial space rooms": "No se han podido crear las salas iniciales del espacio",
+    "Room name": "Nombre de la sala",
+    "Support": "Ayuda",
+    "Random": "Al azar",
+    "Your public space <name/>": "Tu espacio público <name/>",
+    "You have been invited to <name/>": "Te han invitado a <name/>",
+    "<inviter/> invited you to <name/>": "<inviter/> te ha invitado a <name/>",
+    "%(count)s members|one": "%(count)s miembro",
+    "%(count)s members|other": "%(count)s miembros",
+    "Your server does not support showing space hierarchies.": "Este servidor no soporta mostrar jerarquías de espacios.",
+    "Default Rooms": "Salas por defecto",
+    "Add existing rooms & spaces": "Añadir salas y espacios ya existentes",
+    "Accept Invite": "Aceptar invitación",
+    "Manage rooms": "Gestionar salas",
+    "Save changes": "Guardar cambios",
+    "You're in this room": "Estás en esta sala",
+    "You're in this space": "Eres parte de este espacio",
+    "No permissions": "Sin permisos",
+    "Remove from Space": "Quitar del espacio",
+    "Undo": "Deshacer",
+    "Your message wasn't sent because this homeserver has been blocked by it's administrator. Please <a>contact your service administrator</a> to continue using the service.": "Tu mensaje no ha sido enviado porque este servidor base ha sido bloqueado por su administración. Por favor, <a>ponte en contacto con ellos</a> para continuar usando el servicio.",
+    "Are you sure you want to leave the space '%(spaceName)s'?": "¿Salir del espacio «%(spaceName)s»?",
+    "This space is not public. You will not be able to rejoin without an invite.": "Este espacio es privado. No podrás volverte a unir sin una invitación.",
+    "Start audio stream": "Empezar retransmisión de audio",
+    "Failed to start livestream": "No se ha podido empezar la retransmisión",
+    "Unable to start audio streaming.": "No se ha podido empezar la retransmisión del audio.",
+    "Save Changes": "Guardar cambios",
+    "View dev tools": "Ver herramientas de desarrollador",
+    "Leave Space": "Salir del espacio",
+    "Make this space private": "Hacer este espacio privado",
+    "Edit settings relating to your space.": "Editar ajustes relacionados con tu espacio.",
+    "Space settings": "Ajustes del espacio",
+    "Failed to save space settings.": "No se han podido guardar los ajustes del espacio.",
+    "Invite someone using their name, email address, username (like <userId/>) or <a>share this space</a>.": "Invita a más gente usando su nombre, correo electrónico, nombre de usuario (ej.: <userId/>) o <a>compartiendo este espacio</a>.",
+    "Invite someone using their name, username (like <userId/>) or <a>share this space</a>.": "Invita a más gente usando su nombre, nombre de usuario (ej.: <userId/>) o <a>compartiendo este espacio</a>.",
+    "Unnamed Space": "Espacio sin nombre",
+    "Invite to %(spaceName)s": "Invitar a %(spaceName)s",
+    "Failed to add rooms to space": "No se han podido añadir las salas al espacio",
+    "Apply": "Aplicar",
+    "Create a new room": "Crea una nueva",
+    "Don't want to add an existing room?": "¿No quieres añadir una sala que ya exista?",
+    "Spaces": "Espacios",
+    "Filter your rooms and spaces": "Filtra tus salas y espacios",
+    "Add existing spaces/rooms": "Añadir espacios o salas ya existentes",
+    "Space selection": "Selección de espacio",
+    "Empty room": "Sala vacía",
+    "Suggested Rooms": "Salas sugeridas",
+    "Explore space rooms": "Explorar las salas del espacio",
+    "You do not have permissions to add rooms to this space": "No tienes permisos para añadir salas a este espacio",
+    "Add existing room": "Añadir sala ya existente",
+    "You do not have permissions to create new rooms in this space": "No tienes permisos para crear nuevas salas en este espacio",
+    "Send message": "Enviar mensaje",
+    "Invite to this space": "Invitar a este espacio",
+    "Your message was sent": "Mensaje enviado",
+    "Spell check dictionaries": "Diccionarios de comprobación de ortografía",
+    "Space options": "Opciones del espacio",
+    "Space Home": "Inicio del espacio",
+    "New room": "Nueva sala",
+    "Leave space": "Salir del espacio",
+    "Invite people": "Invitar a gente",
+    "Share your public space": "Comparte tu espacio público",
+    "Invite members": "Invitar a gente",
+    "Invite by email or username": "Invitar usando correo electrónico o nombre de usuario",
+    "Share invite link": "Compartir enlace de invitación",
+    "Click to copy": "Haz clic para copiar",
+    "Collapse space panel": "Colapsar panel del espacio",
+    "Expand space panel": "Expandir panel del espacio",
+    "You can change these at any point.": "Puedes cambiar todo esto cuando quieras.",
+    "Give it a photo, name and description to help you identify it.": "Añádele una foto, nombre o descripción que te ayude a identificarlo.",
+    "Your private space": "Tu espacio privado",
+    "Your public space": "Tu espacio público",
+    "You can change this later": "Puedes cambiar esto más adelante",
+    "Invite only, best for yourself or teams": "Solo con invitación, mejor para ti o para equipos",
+    "Private": "Privado",
+    "Open space for anyone, best for communities": "Espacio abierto para todo el mundo, la mejor opción para comunidades",
+    "Public": "Público",
+    "Spaces are new ways to group rooms and people. To join an existing space you’ll need an invite": "Los espacios son la manera de agrupar salas y gente. Para unirte a un espacio ya existente, necesitarás que te inviten",
+    "Create a space": "Crear un espacio",
+    "Delete": "Borrar",
+    "Spaces prototype. Incompatible with Communities, Communities v2 and Custom Tags. Requires compatible homeserver for some features.": "Prototipo de espacios. No compatible con comunidades, comunidades v2 o etiquetas personalizadas. Necesita un servidor base compatible para algunas funcionalidades.",
+    "This homeserver has been blocked by its administrator.": "Este servidor base ha sido bloqueado por su administración.",
+    "This homeserver has been blocked by it's administrator.": "Este servidor base ha sido bloqueado por su administración.",
+    "You're already in a call with this person.": "Ya estás en una llamada con esta persona."
 }

From ab6e1c6fb033cfce0fc56fc61e854ae9a76b214e Mon Sep 17 00:00:00 2001
From: Thibault Martin <mail@thibaultmart.in>
Date: Sun, 14 Mar 2021 17:27:38 +0000
Subject: [PATCH 332/420] Translated using Weblate (French)

Currently translated at 99.9% (2887 of 2889 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fr/
---
 src/i18n/strings/fr.json | 151 ++++++++++++++++++++++++++++++++++-----
 1 file changed, 132 insertions(+), 19 deletions(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index dc6a70bc24..6fcc0323d7 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -40,7 +40,7 @@
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s a changé le rang de %(powerLevelDiffText)s.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s a changé le nom du salon en %(roomName)s.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s a changé le sujet du salon en « %(topic)s ».",
-    "Changes your display nickname": "Change votre nom d’affichage",
+    "Changes your display nickname": "Modifie votre nom d’affichage",
     "Click here to fix": "Cliquer ici pour réparer",
     "Click to mute audio": "Cliquer pour couper le son",
     "Click to mute video": "Cliquer ici pour couper la vidéo",
@@ -636,7 +636,7 @@
     "This room is not public. You will not be able to rejoin without an invite.": "Ce salon n’est pas public. Vous ne pourrez pas y revenir sans invitation.",
     "Community IDs cannot be empty.": "Les identifiants de communauté ne peuvent pas être vides.",
     "<a>In reply to</a> <pill>": "<a>En réponse à</a> <pill>",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s a changé son nom d’affichage en %(displayName)s.",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s a modifié son nom d’affichage en %(displayName)s.",
     "Failed to set direct chat tag": "Échec de l’ajout de l’étiquette discussion directe",
     "Failed to remove tag %(tagName)s from room": "Échec de la suppression de l’étiquette %(tagName)s du salon",
     "Failed to add tag %(tagName)s to room": "Échec de l’ajout de l’étiquette %(tagName)s au salon",
@@ -714,7 +714,7 @@
     "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s utilise de nombreuses fonctionnalités avancées du navigateur, certaines ne sont pas disponibles ou expérimentales dans votre navigateur actuel.",
     "Developer Tools": "Outils de développement",
     "Remember, you can always set an email address in user settings if you change your mind.": "Souvenez-vous que vous pourrez toujours définir une adresse e-mail dans les paramètres de l'utilisateur si vous changez d’avis.",
-    "Explore Account Data": "Explorer les données du compte",
+    "Explore Account Data": "Parcourir les données du compte",
     "Remove from Directory": "Supprimer du répertoire",
     "Saturday": "Samedi",
     "I understand the risks and wish to continue": "Je comprends les risques et souhaite continuer",
@@ -1012,7 +1012,7 @@
     "Developer options": "Options de développeur",
     "General": "Général",
     "Room Addresses": "Adresses du salon",
-    "Set a new account password...": "Définir un nouveau mot de passe du compte…",
+    "Set a new account password...": "Définir un nouveau mot de passe pour ce compte…",
     "Email addresses": "Adresses e-mail",
     "Phone numbers": "Numéros de téléphone",
     "Language and region": "Langue et région",
@@ -1189,7 +1189,7 @@
     "Allow Peer-to-Peer for 1:1 calls": "Autoriser les connexions pair-à-pair pour les appels individuels",
     "Credits": "Crédits",
     "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "Si vous avez rencontré des problèmes ou si vous souhaitez partager votre avis, dites-le nous sur GitHub.",
-    "Changes your display nickname in the current room only": "Change votre nom d’affichage seulement dans le salon actuel",
+    "Changes your display nickname in the current room only": "Modifie votre nom d’affichage seulement dans le salon actuel",
     "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s a activé le badge pour %(groups)s dans ce salon.",
     "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s a désactivé le badge pour %(groups)s dans ce salon.",
     "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s a activé le badge pour %(newGroups)s et désactivé le badge pour %(oldGroups)s dans ce salon.",
@@ -1281,7 +1281,7 @@
     "Upload Error": "Erreur d’envoi",
     "The server does not support the room version specified.": "Le serveur ne prend pas en charge la version de salon spécifiée.",
     "Name or Matrix ID": "Nom ou identifiant Matrix",
-    "Changes your avatar in this current room only": "Change votre avatar seulement dans le salon actuel",
+    "Changes your avatar in this current room only": "Modifie votre avatar seulement dans le salon actuel",
     "Unbans user with given ID": "Révoque le bannissement de l’utilisateur ayant l’identifiant fourni",
     "Sends the given message coloured as a rainbow": "Envoie le message coloré aux couleurs de l’arc-en-ciel",
     "Sends the given emote coloured as a rainbow": "Envoie la réaction colorée aux couleurs de l’arc-en-ciel",
@@ -1383,7 +1383,7 @@
     "Resend %(unsentCount)s reaction(s)": "Renvoyer %(unsentCount)s réaction(s)",
     "Resend removal": "Renvoyer la suppression",
     "Your homeserver doesn't seem to support this feature.": "Il semble que votre serveur d’accueil ne prenne pas en charge cette fonctionnalité.",
-    "Changes your avatar in all rooms": "Change votre avatar dans tous les salons",
+    "Changes your avatar in all rooms": "Modifie votre avatar dans tous les salons",
     "You're signed out": "Vous êtes déconnecté",
     "Clear all data": "Supprimer toutes les données",
     "Removing…": "Suppression…",
@@ -1504,7 +1504,7 @@
     "Find a room…": "Trouver un salon…",
     "Find a room… (e.g. %(exampleRoom)s)": "Trouver un salon… (par ex. %(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 vous ne trouvez pas le salon que vous cherchez, demandez une invitation ou <a>créez un nouveau salon</a>.",
-    "Explore rooms": "Explorer les salons",
+    "Explore rooms": "Parcourir les salons",
     "Verify the link in your inbox": "Vérifiez le lien dans votre boîte de réception",
     "Complete": "Terminer",
     "Please fill why you're reporting.": "Dites-nous pourquoi vous envoyez un signalement.",
@@ -1514,7 +1514,7 @@
     "Report Content": "Signaler le contenu",
     "Read Marker lifetime (ms)": "Durée de vie du repère de lecture (ms)",
     "Read Marker off-screen lifetime (ms)": "Durée de vie du repère de lecture en dehors de l’écran (ms)",
-    "Changes the avatar of the current room": "Change l’avatar du salon actuel",
+    "Changes the avatar of the current room": "Modifie l’avatar du salon actuel",
     "e.g. my-room": "par ex. mon-salon",
     "Close dialog": "Fermer la boîte de dialogue",
     "Please enter a name for the room": "Veuillez renseigner un nom pour le salon",
@@ -2003,7 +2003,7 @@
     "Remove server": "Supprimer le serveur",
     "Matrix": "Matrix",
     "Add a new server": "Ajouter un nouveau serveur",
-    "Enter the name of a new server you want to explore.": "Saisissez le nom du nouveau serveur que vous voulez explorer.",
+    "Enter the name of a new server you want to explore.": "Saisissez le nom du nouveau serveur que vous voulez parcourir.",
     "Server name": "Nom du serveur",
     "Add a new server...": "Ajouter un nouveau serveur…",
     "%(networkName)s rooms": "%(networkName)s salons",
@@ -2060,7 +2060,7 @@
     "Confirm by comparing the following with the User Settings in your other session:": "Confirmez en comparant ceci avec les paramètres utilisateurs de votre autre session :",
     "Confirm this user's session by comparing the following with their User Settings:": "Confirmez la session de cet utilisateur en comparant ceci avec ses paramètres utilisateur :",
     "If they don't match, the security of your communication may be compromised.": "S’ils ne correspondent pas, la sécurité de vos communications est peut-être compromise.",
-    "Navigate composer history": "Explorer l’historique du compositeur",
+    "Navigate composer history": "Parcourir l’historique du compositeur",
     "Previous/next unread room or DM": "Salon ou conversation privée non lu précédent/suivant",
     "Previous/next room or DM": "Salon ou conversation privée précédent/suivant",
     "Toggle right panel": "Afficher/masquer le panneau de droite",
@@ -2129,7 +2129,7 @@
     "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 robots ne fonctionneront pas pour le moment.",
-    "Failed to set topic": "Échec du changement de sujet",
+    "Failed to set topic": "Échec de la modification du sujet",
     "Command failed": "La commande a échoué",
     "Could not find user in room": "Impossible de trouver l’utilisateur dans le salon",
     "Syncing...": "Synchronisation…",
@@ -2472,11 +2472,11 @@
     "Room Info": "Informations sur le salon",
     "%(count)s results|one": "%(count)s résultat",
     "%(count)s results|other": "%(count)s résultats",
-    "Explore all public rooms": "Explorer tous les salons publics",
+    "Explore all public rooms": "Parcourir tous les salons publics",
     "Can't see what you’re looking for?": "Vous ne trouvez pas ce que vous cherchez ?",
     "Custom Tag": "Étiquette personnalisée",
-    "Explore public rooms": "Explorer les salons publics",
-    "Explore community rooms": "Explorer les salons de la communauté",
+    "Explore public rooms": "Parcourir les salons publics",
+    "Explore community rooms": "Parcourir les salons de la communauté",
     "Show Widgets": "Afficher les widgets",
     "Hide Widgets": "Masquer les widgets",
     "Remove messages sent by others": "Supprimer les messages envoyés par d’autres",
@@ -2493,7 +2493,7 @@
     "Starting camera...": "Allumage de la caméra ...",
     "Call connecting...": "Connexion à l'appel …",
     "Calling...": "Appel en cours …",
-    "Explore rooms in %(communityName)s": "Explorer les salons dans %(communityName)s",
+    "Explore rooms in %(communityName)s": "Parcourir les salons de %(communityName)s",
     "You have no visible notifications in this room.": "Vous n'avez pas de notification visible dans ce salon.",
     "You’re all caught up": "Vous êtes à jour",
     "You do not have permission to create rooms in this community.": "Vous n’avez pas la permission de créer des salons dans cette communauté.",
@@ -2897,7 +2897,7 @@
     "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "Les messages ici sont chiffrés de bout en bout. Quand les gens joignent, vous pouvez les vérifier dans leur profil, tapez simplement sur leur avatar.",
     "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.": "Les messages ici sont chiffrés de bout en bout. Vérifiez %(displayName)s dans leur profil - tapez sur leur avatar.",
     "Role": "Rôle",
-    "Use the + to make a new room or explore existing ones below": "Utilisez le + pour créer un nouveau salon ou explorer ceux existant ci-dessous",
+    "Use the + to make a new room or explore existing ones below": "Utilisez le + pour créer un nouveau salon ou parcourir ceux existant ci-dessous",
     "This is the start of <roomName/>.": "C’est le début de <roomName/>.",
     "Add a photo, so people can easily spot your room.": "Ajoutez une photo afin que les gens repèrent facilement votre salon.",
     "%(displayName)s created this room.": "%(displayName)s a créé ce salon.",
@@ -2906,7 +2906,7 @@
     "Topic: %(topic)s ": "Sujet : %(topic)s ",
     "Topic: %(topic)s (<a>edit</a>)": "Sujet : %(topic)s (<a>modifier</a>)",
     "This is the beginning of your direct message history with <displayName/>.": "C’est le début de votre historique de messages privés avec <displayName/>.",
-    "Only the two of you are in this conversation, unless either of you invites anyone to join.": "Vous n’êtes que tous les deux dans cette conversation, à moins que l’un de vous invite quelqu’un.",
+    "Only the two of you are in this conversation, unless either of you invites anyone to join.": "Vous n’êtes que tous les deux dans cette conversation, à moins que l’un de vous invite quelqu’un à vous rejoindre.",
     "%(name)s on hold": "%(name)s est en attente",
     "Return to call": "Revenir à l’appel",
     "Fill Screen": "Remplir l’écran",
@@ -3065,5 +3065,118 @@
     "Setting ID": "Identifiant de paramètre",
     "Failed to save settings": "Échec lors de la sauvegarde des paramètres",
     "Settings Explorer": "Explorateur de paramètres",
-    "Show chat effects (animations when receiving e.g. confetti)": "Afficher les animations de conversation (animations lors de la réception par ex. de confettis)"
+    "Show chat effects (animations when receiving e.g. confetti)": "Afficher les animations de conversation (animations lors de la réception par ex. de confettis)",
+    "Invite someone using their name, username (like <userId/>) or <a>share this space</a>.": "Invitez quelqu’un grâce à son nom, nom d’utilisateur (tel que <userId/>) ou <a>partagez cet espace</a>.",
+    "Invite someone using their name, email address, username (like <userId/>) or <a>share this space</a>.": "Invitez quelqu’un grâce à son nom, adresse e-mail, nom d’utilisateur (tel que <userId/>) ou <a>partagez cet espace</a>.",
+    "Original event source": "Événement source original",
+    "Decrypted event source": "Événement source déchiffré",
+    "We'll create rooms for each of them. You can add existing rooms after setup.": "Nous allons créer un salon pour chacun d’entre eux. Vous pourrez ajouter des salons après l’initialisation.",
+    "What projects are you working on?": "Sur quels projets travaillez vous ?",
+    "We'll create rooms for each topic.": "Nous allons créer un salon pour chaque sujet.",
+    "What are some things you want to discuss?": "De quoi voulez vous discuter ?",
+    "Inviting...": "Invitation…",
+    "Invite by username": "Inviter par nom d’utilisateur",
+    "Invite your teammates": "Invitez votre équipe",
+    "Failed to invite the following users to your space: %(csvUsers)s": "Échec de l’invitation des utilisateurs suivants à votre espace : %(csvUsers)s",
+    "A private space for you and your teammates": "Un espace privé pour vous et votre équipe",
+    "Me and my teammates": "Moi et mon équipe",
+    "A private space just for you": "Un espace privé seulement pour vous",
+    "Just Me": "Seulement moi",
+    "Ensure the right people have access to the space.": "Vérifiez que les bonnes personnes ont accès à cet espace.",
+    "Who are you working with?": "Avec qui travaillez vous ?",
+    "Finish": "Finir",
+    "At the moment only you can see it.": "Pour l’instant vous seul pouvez le voir.",
+    "Creating rooms...": "Création des salons…",
+    "Skip for now": "Passer pour l’instant",
+    "Failed to create initial space rooms": "Échec de la création des salons initiaux de l’espace",
+    "Room name": "Nom du salon",
+    "Support": "Prise en charge",
+    "Random": "Aléatoire",
+    "Welcome to <name/>": "Bienvenue dans <name/>",
+    "Your private space <name/>": "Votre espace privé <name/>",
+    "Your public space <name/>": "Votre espace public <name/>",
+    "You have been invited to <name/>": "Vous avez été invité dans <name/>",
+    "<inviter/> invited you to <name/>": "<inviter/> vous a invité dans <name/>",
+    "%(count)s members|one": "%(count)s membre",
+    "%(count)s members|other": "%(count)s membres",
+    "Your server does not support showing space hierarchies.": "Votre serveur ne prend pas en charge l’affichage des hiérarchies d’espaces.",
+    "Default Rooms": "Salons par défaut",
+    "Add existing rooms & spaces": "Ajouter des salons et espaces existants",
+    "Accept Invite": "Accepter l’invitation",
+    "Find a room...": "Trouver un salon…",
+    "Manage rooms": "Gérer les salons",
+    "Save changes": "Enregistrer les modifications",
+    "You're in this room": "Vous faites partie de ce salon",
+    "You're in this space": "Vous faites partie de cet espace",
+    "No permissions": "Aucune permission",
+    "Remove from Space": "Supprimer de l’espace",
+    "Undo": "Annuler",
+    "Your message wasn't sent because this homeserver has been blocked by it's administrator. Please <a>contact your service administrator</a> to continue using the service.": "Votre message n’a pas été envoyé car ce serveur d’accueil a été banni par son administrateur. Merci de <a>contacter votre administrateur de service</a> pour poursuivre l’usage de ce service.",
+    "Are you sure you want to leave the space '%(spaceName)s'?": "Êtes vous sûr de vouloir quitter l’espace « %(spaceName)s » ?",
+    "This space is not public. You will not be able to rejoin without an invite.": "Cet espace n’est pas public. Vous ne pourrez pas le rejoindre sans invitation.",
+    "Start audio stream": "Démarrer une diffusion audio",
+    "Failed to start livestream": "Échec lors du démarrage de la diffusion en direct",
+    "Unable to start audio streaming.": "Impossible de démarrer la diffusion audio.",
+    "Save Changes": "Enregistrer les modifications",
+    "Saving...": "Enregistrement…",
+    "View dev tools": "Afficher les outils de développement",
+    "Leave Space": "Quitter l’espace",
+    "Make this space private": "Rendre cet espace privé",
+    "Edit settings relating to your space.": "Modifiez les paramètres de votre espace.",
+    "Space settings": "Paramètres de l’espace",
+    "Failed to save space settings.": "Échec de l’enregistrement des paramètres.",
+    "Unnamed Space": "Espace sans nom",
+    "Invite to %(spaceName)s": "Inviter à %(spaceName)s",
+    "Failed to add rooms to space": "Échec de l’ajout des salons à l’espace",
+    "Apply": "Appliquer",
+    "Applying...": "Application…",
+    "Create a new room": "Créer un nouveau salon",
+    "Don't want to add an existing room?": "Vous ne voulez pas ajouter de salon existant ?",
+    "Spaces": "Espaces",
+    "Filter your rooms and spaces": "Filtrez vos salons et espaces",
+    "Add existing spaces/rooms": "Ajouter des espaces/salons existants",
+    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the space it will be impossible to regain privileges.": "Vous ne pourrez pas annuler ce changement puisque vous vous rétrogradez. Si vous êtes le dernier utilisateur a privilèges de cet espace, il deviendra impossible d’en reprendre contrôle.",
+    "Empty room": "Salon vide",
+    "Suggested Rooms": "Salons suggérés",
+    "Explore space rooms": "Parcourir les salons de cet espace",
+    "You do not have permissions to add rooms to this space": "Vous n’avez pas la permission d’ajouter des salons à cet espace",
+    "Add existing room": "Ajouter un salon existant",
+    "You do not have permissions to create new rooms in this space": "Vous n’avez pas la permission de créer de nouveaux salons dans cet espace",
+    "Send message": "Envoyer le message",
+    "Invite to this space": "Inviter dans cet espace",
+    "Your message was sent": "Votre message a été envoyé",
+    "Encrypting your message...": "Chiffrement de votre message…",
+    "Sending your message...": "Envoi de votre message…",
+    "Spell check dictionaries": "Dictionnaires de correction orthographique",
+    "Space options": "Options de l’espace",
+    "Space Home": "Accueil de l’espace",
+    "New room": "Nouveau salon",
+    "Leave space": "Quitter l’espace",
+    "Invite people": "Inviter des personnes",
+    "Share your public space": "Partager votre espace public",
+    "Invite members": "Inviter des membres",
+    "Invite by email or username": "Inviter par e-mail ou nom d’utilisateur",
+    "Share invite link": "Partager le lien d’invitation",
+    "Click to copy": "Cliquez pour copier",
+    "Collapse space panel": "Réduire le panneau de l’espace",
+    "Expand space panel": "Développer le panneau de l’espace",
+    "Creating...": "Création…",
+    "You can change these at any point.": "Vous pouvez les changer à n’importe quel moment.",
+    "Give it a photo, name and description to help you identify it.": "Définissez une photo, un nom et une description pour vous aider à le retrouver.",
+    "Your private space": "Votre espace privé",
+    "Your public space": "Votre espace public",
+    "You can change this later": "Vous pouvez changer ceci plus tard",
+    "Invite only, best for yourself or teams": "Sur invitation, idéal pour vous-même ou les équipes",
+    "Private": "Privé",
+    "Open space for anyone, best for communities": "Espace ouvert à tous, idéal pour les communautés",
+    "Public": "Public",
+    "Spaces are new ways to group rooms and people. To join an existing space you’ll need an invite": "Les espaces sont un nouveau moyen de grouper les salons et les personnes. Une invitation est nécessaire pour rejoindre un espace existant",
+    "Create a space": "Créer un espace",
+    "Delete": "Supprimer",
+    "Jump to the bottom of the timeline when you send a message": "Sauter en bas du fil de discussion lorsque vous envoyez un message",
+    "Spaces prototype. Incompatible with Communities, Communities v2 and Custom Tags. Requires compatible homeserver for some features.": "Prototype d’espaces. Incompatible avec les communautés, les communautés v2 et les étiquettes personnalisées. Nécessite un serveur d’accueil compatible pour certaines fonctionnalités.",
+    "This homeserver has been blocked by it's administrator.": "Ce serveur d’accueil a été banni par ses administrateurs.",
+    "This homeserver has been blocked by its administrator.": "Ce serveur d’accueil a été banni par ses administrateurs.",
+    "You're already in a call with this person.": "Vous êtes déjà en cours d’appel avec cette personne.",
+    "Already in call": "Déjà en cours d’appel"
 }

From 1d15a3596dcf58f31b5c49d66a6bd08ee7b90abe Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Mon, 15 Mar 2021 17:07:45 +0000
Subject: [PATCH 333/420] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2889 of 2889 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
---
 src/i18n/strings/hu.json | 119 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 117 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index d0f8cc3b69..e5901ef9a3 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -11,7 +11,7 @@
     "Notifications": "Értesítések",
     "Operation failed": "Sikertelen művelet",
     "powered by Matrix": "a gépházban: Matrix",
-    "Remove": "Kitakarás",
+    "Remove": "Eltávolítás",
     "Settings": "Beállítások",
     "unknown error code": "ismeretlen hibakód",
     "Accept": "Elfogad",
@@ -3082,5 +3082,120 @@
     "Setting ID": "Beállítás azon.",
     "Failed to save settings": "A beállítások elmentése nem sikerült",
     "Settings Explorer": "Beállítás Böngésző",
-    "Show chat effects (animations when receiving e.g. confetti)": "Csevegés effektek megjelenítése (mint a konfetti animáció)"
+    "Show chat effects (animations when receiving e.g. confetti)": "Csevegés effektek megjelenítése (mint a konfetti animáció)",
+    "Original event source": "Eredeti esemény forráskód",
+    "Decrypted event source": "Visszafejtett esemény forráskód",
+    "We'll create rooms for each of them. You can add existing rooms after setup.": "Mindegyikhez készítünk egy szobát. A beállítás után hozzá tud adni meglévő szobákat.",
+    "What projects are you working on?": "Milyen projekteken dolgozik?",
+    "We'll create rooms for each topic.": "Minden témához készítünk egy szobát.",
+    "What are some things you want to discuss?": "Mik azok amiket meg szeretnének beszélni?",
+    "Inviting...": "Meghívás…",
+    "Invite by username": "Meghívás felhasználónévvel",
+    "Invite your teammates": "Csoporttársak meghívása",
+    "Failed to invite the following users to your space: %(csvUsers)s": "Az alábbi felhasználókat nem sikerült meghívni a térbe: %(csvUsers)s",
+    "A private space for you and your teammates": "Privát tér önnek és a csoporttársainak",
+    "Me and my teammates": "Én és a csoporttársaim",
+    "A private space just for you": "Privát tér csak önnek",
+    "Just Me": "Csak én",
+    "Ensure the right people have access to the space.": "Biztosítsa, hogy a térhez a megfelelő embereknek van hozzáférése.",
+    "Who are you working with?": "Kivel dolgozik együtt?",
+    "Finish": "Befejez",
+    "At the moment only you can see it.": "Jelenleg csak ön láthatja.",
+    "Creating rooms...": "Szobák létrehozása…",
+    "Skip for now": "Kihagy egyenlőre",
+    "Failed to create initial space rooms": "Térhez tartozó kezdő szobákat nem sikerült elkészíteni",
+    "Room name": "Szoba neve",
+    "Support": "Támogatás",
+    "Random": "Véletlen",
+    "Welcome to <name/>": "Üdvözlöm itt: <name/>",
+    "Your private space <name/>": "Privát tere: <name/>",
+    "Your public space <name/>": "Nyilvános tere: <name/>",
+    "You have been invited to <name/>": "Meghívták ide: <name/>",
+    "<inviter/> invited you to <name/>": "<inviter/> meghívta ide: <name/>",
+    "%(count)s members|one": "%(count)s tag",
+    "%(count)s members|other": "%(count)s tag",
+    "Your server does not support showing space hierarchies.": "A szervere nem támogatja a terek hierarchiáinak a megjelenítését.",
+    "Default Rooms": "Alapértelmezett szobák",
+    "Add existing rooms & spaces": "Létező szobák és terek hozzáadása",
+    "Accept Invite": "Meghívó elfogadása",
+    "Find a room...": "Szoba keresése…",
+    "Manage rooms": "Szobák kezelése",
+    "Promoted to users": "A felhasználók figyelmébe ajánlva",
+    "Save changes": "Változások mentése",
+    "You're in this room": "Ebben a szobában van",
+    "You're in this space": "Ebben a térben van",
+    "No permissions": "Nincs jogosultság",
+    "Remove from Space": "Eltávolítás a térből",
+    "Undo": "Visszavon",
+    "Your message wasn't sent because this homeserver has been blocked by it's administrator. Please <a>contact your service administrator</a> to continue using the service.": "Az üzenete nem került elküldésre mert az adminisztrátor megtiltotta ezen a Matrix szerveren. A szolgáltatás további igénybevétele végett kérjük <a>vegye fel a kapcsolatot a szolgáltatás adminisztrátorával</a>.",
+    "Are you sure you want to leave the space '%(spaceName)s'?": "Biztos, hogy elhagyja ezt a teret: %(spaceName)s?",
+    "This space is not public. You will not be able to rejoin without an invite.": "Ez a tér nem nyilvános. Kilépés után csak újabb meghívóval lehet újra belépni.",
+    "Start audio stream": "Hang folyam indítása",
+    "Failed to start livestream": "Az élő adás indítása sikertelen",
+    "Unable to start audio streaming.": "A hang folyam indítása sikertelen.",
+    "Save Changes": "Változások mentése",
+    "Saving...": "Mentés…",
+    "View dev tools": "Fejlesztői eszközök megjelenítése",
+    "Leave Space": "Tér elhagyása",
+    "Make this space private": "Tér beállítása privátnak",
+    "Edit settings relating to your space.": "Tér beállításainak szerkesztése.",
+    "Space settings": "Tér beállítások",
+    "Failed to save space settings.": "A tér beállításának mentése nem sikerült.",
+    "Invite someone using their name, username (like <userId/>) or <a>share this space</a>.": "Hívjon meg valakit a nevével, felhasználói nevével (pl. <userId/>) vagy <a>oszd meg ezt a teret</a>.",
+    "Invite someone using their name, email address, username (like <userId/>) or <a>share this space</a>.": "Hívjon meg valakit a nevét, e-mail címét, vagy felhasználónevét (például <userId/>) megadva, vagy <a>oszd meg ezt a teret</a>.",
+    "Unnamed Space": "Névtelen tér",
+    "Invite to %(spaceName)s": "Meghívás ide: %(spaceName)s",
+    "Failed to add rooms to space": "A szobát nem sikerült hozzáadni a térhez",
+    "Apply": "Alkalmaz",
+    "Applying...": "Alkalmaz…",
+    "Create a new room": "Új szoba készítése",
+    "Don't want to add an existing room?": "Nem szeretne létező szobát hozzáadni?",
+    "Spaces": "Terek",
+    "Filter your rooms and spaces": "Terek és szobák szűrése",
+    "Add existing spaces/rooms": "Létező terek/szobák hozzáadása",
+    "Space selection": "Tér kiválasztása",
+    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the space it will be impossible to regain privileges.": "Nem fogja tudni visszavonni ezt a változtatást, mert lefokozza magát, ha Ön az utolsó privilegizált felhasználó a térben, akkor lehetetlen lesz a jogosultságok visszanyerése.",
+    "Empty room": "Üres szoba",
+    "Suggested Rooms": "Javasolt szobák",
+    "Explore space rooms": "Szobák felderítése ebben a térben",
+    "You do not have permissions to add rooms to this space": "Nincs jogosultsága szobát hozzáadni ehhez a térhez",
+    "Add existing room": "Létező szoba hozzáadása",
+    "You do not have permissions to create new rooms in this space": "Nincs jogosultsága szoba létrehozására ebben a térben",
+    "Send message": "Üzenet küldése",
+    "Invite to this space": "Meghívás a térbe",
+    "Your message was sent": "Üzenet elküldve",
+    "Encrypting your message...": "Üzenet titkosítása…",
+    "Sending your message...": "Üzenet küldése…",
+    "Spell check dictionaries": "Helyesírási szótárak",
+    "Space options": "Tér beállításai",
+    "Space Home": "Tér Otthona",
+    "New room": "Új szoba",
+    "Leave space": "Tér elhagyása",
+    "Invite people": "Személyek meghívása",
+    "Share your public space": "Nyilvános tér megosztása",
+    "Invite members": "Tagok meghívása",
+    "Invite by email or username": "Meghívás e-mail címmel vagy felhasználói névvel",
+    "Share invite link": "Meghívó linkjének megosztása",
+    "Click to copy": "Másolás kattintással",
+    "Collapse space panel": "Tér panel összezárása",
+    "Expand space panel": "Tér panel kiterjesztése",
+    "Creating...": "Készül...",
+    "You can change these at any point.": "Bármikor megváltoztatható.",
+    "Give it a photo, name and description to help you identify it.": "Fotóval, névvel és leírással lehet segíteni az azonosítást.",
+    "Your private space": "Privát tér",
+    "Your public space": "Nyilvános tér",
+    "You can change this later": "Ezt később meg lehet változtatni",
+    "Invite only, best for yourself or teams": "Csak meghívóval, saját célra és csoportoknak ideális",
+    "Private": "Privát",
+    "Open space for anyone, best for communities": "Nyílt tér mindenkinek, a legjobb a közösségeknek",
+    "Public": "Nyilvános",
+    "Spaces are new ways to group rooms and people. To join an existing space you’ll need an invite": "A terek egy új lehetőség a szobák és emberek csoportosításához. Létező térhez meghívóval lehet csatlakozni",
+    "Create a space": "Tér készítése",
+    "Delete": "Töröl",
+    "Jump to the bottom of the timeline when you send a message": "Üzenetküldés után az idővonal aljára ugrás",
+    "Spaces prototype. Incompatible with Communities, Communities v2 and Custom Tags. Requires compatible homeserver for some features.": "Terek prototípus. Nem kompatibilis se a Közösségekkel, közösségek v2-vel és az egyedi címkékkel. Kompatibilis matrix szerver kell bizonyos funkciókhoz.",
+    "This homeserver has been blocked by it's administrator.": "Ezt a matrix szervert az adminisztrátor lezárta.",
+    "This homeserver has been blocked by its administrator.": "Ezt a matrix szervert az adminisztrátor lezárta.",
+    "You're already in a call with this person.": "Már hívásban van ezzel a személlyel.",
+    "Already in call": "A hívás már folyamatban van"
 }

From b1def1fecb5df49e83fa37ad8438ff4f102f4230 Mon Sep 17 00:00:00 2001
From: jelv <post@jelv.nl>
Date: Mon, 15 Mar 2021 07:33:33 +0000
Subject: [PATCH 334/420] Translated using Weblate (Dutch)

Currently translated at 100.0% (2889 of 2889 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
---
 src/i18n/strings/nl.json | 265 ++++++++++++++++++++++++++++-----------
 1 file changed, 190 insertions(+), 75 deletions(-)

diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 18c7c3b0bf..e9e90f4b92 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -130,7 +130,7 @@
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s heeft de gespreksnaam verwijderd.",
     "Create Room": "Gesprek aanmaken",
     "/ddg is not a command": "/ddg is geen opdracht",
-    "Deactivate Account": "Account sluiten",
+    "Deactivate Account": "Account Sluiten",
     "Decline": "Weigeren",
     "Decrypt %(text)s": "%(text)s ontsleutelen",
     "Disinvite": "Uitnodiging intrekken",
@@ -422,7 +422,7 @@
     "Delete Widget": "Widget verwijderen",
     "Who would you like to add to this community?": "Wie wil je toevoegen aan deze gemeenschap?",
     "Invite to Community": "Uitnodigen tot gemeenschap",
-    "Show these rooms to non-members on the community page and room list?": "Deze gesprekken tonen aan niet-leden op de gemeenschapspagina en gesprekslijst?",
+    "Show these rooms to non-members on the community page and room list?": "Deze gesprekken tonen aan niet-leden op de gemeenschapspagina en openbare gesprekkenlijst?",
     "Add rooms to the community": "Voeg gesprekken toe aan de gemeenschap",
     "Add to community": "Toevoegen aan gemeenschap",
     "Failed to invite the following users to %(groupId)s:": "Uitnodigen van volgende gebruikers tot %(groupId)s is mislukt:",
@@ -640,7 +640,7 @@
     "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s heeft %(displayName)s als weergavenaam aangenomen.",
     "Key request sent.": "Sleutelverzoek verstuurd.",
     "Did you know: you can use communities to filter your %(brand)s experience!": "Tip: u kunt gemeenschappen gebruiken om uw %(brand)s-beleving te filteren!",
-    "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Versleep een gemeenschapsavatar naar het filterpaneel helemaal links op het scherm om een filter in te stellen. Daarna kunt u op de avatar in het filterpaneel klikken wanneer u zich wilt beperken tot de gesprekken en mensen uit die gemeenschap.",
+    "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Versleep een gemeenschapsavatar naar het filterpaneel helemaal links op het scherm om een filter in te stellen. Daarna kunt u op de avatar in het filterpaneel klikken wanneer u zich wilt beperken tot de gesprekken en personen uit die gemeenschap.",
     "Clear filter": "Filter wissen",
     "Failed to set direct chat tag": "Instellen van direct gespreklabel is mislukt",
     "Failed to remove tag %(tagName)s from room": "Verwijderen van %(tagName)s-label van gesprek is mislukt",
@@ -794,9 +794,9 @@
     "Popout widget": "Widget in nieuw venster openen",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Kan de gebeurtenis waarop gereageerd was niet laden. Wellicht bestaat die niet, of u heeft geen toestemming die te bekijken.",
     "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. <b>This action is irreversible.</b>": "Dit zal uw account voorgoed onbruikbaar maken. U zult niet meer kunnen inloggen, en niemand anders zal zich met dezelfde gebruikers-ID kunnen registreren. Hierdoor zal uw account alle gesprekken waaraan u deelneemt verlaten, en worden de accountgegevens verwijderd van de identiteitsserver. <b>Deze stap is onomkeerbaar.</b>",
-    "Deactivating your account <b>does not by default cause us to forget messages you have sent.</b> If you would like us to forget your messages, please tick the box below.": "Het sluiten van uw account <b>maakt op zich niet dat wij de door u verstuurde berichten vergeten.</b> Als u wilt dat wij uw berichten vergeten, vink dan het vakje hieronder aan.",
+    "Deactivating your account <b>does not by default cause us to forget messages you have sent.</b> If you would like us to forget your messages, please tick the box below.": "Het sluiten van uw account <b>maakt standaard niet dat wij de door u verstuurde berichten vergeten.</b> Als u wilt dat wij uw berichten vergeten, vink dan het vakje hieronder aan.",
     "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "De zichtbaarheid van berichten in Matrix is zoals bij e-mails. Het vergeten van uw berichten betekent dat berichten die u heeft verstuurd niet meer gedeeld worden met nieuwe of ongeregistreerde gebruikers, maar geregistreerde gebruikers die al toegang hebben tot deze berichten zullen alsnog toegang hebben tot hun eigen kopie ervan.",
-    "Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)": "Vergeet bij het sluiten van mijn account alle door mij verstuurde berichten (<b>Let op:</b> hierdoor zullen gebruikers een onvolledig beeld krijgen van gesprekken)",
+    "Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)": "Vergeet bij het sluiten van mijn account alle door mij verstuurde berichten (<b>Let op:</b> hierdoor zullen personen een onvolledig beeld krijgen van gesprekken)",
     "To continue, please enter your password:": "Voer uw wachtwoord in om verder te gaan:",
     "Clear Storage and Sign Out": "Opslag wissen en afmelden",
     "Send Logs": "Logboek versturen",
@@ -847,7 +847,7 @@
     "Unable to load! Check your network connectivity and try again.": "Laden mislukt! Controleer je netwerktoegang en probeer het nogmaals.",
     "Failed to invite users to the room:": "Kon de volgende gebruikers hier niet uitnodigen:",
     "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Plakt ¯\\_(ツ)_/¯ vóór een bericht zonder opmaak",
-    "Upgrades a room to a new version": "Actualiseert het gesprek tot een nieuwe versie",
+    "Upgrades a room to a new version": "Upgrade het gesprek naar de nieuwe versie",
     "Changes your display nickname in the current room only": "Stelt uw weergavenaam alleen in het huidige gesprek in",
     "Gets or sets the room topic": "Verkrijgt het onderwerp van het gesprek of stelt het in",
     "This room has no topic.": "Dit gesprek heeft geen onderwerp.",
@@ -1021,7 +1021,7 @@
     "Verification code": "Verificatiecode",
     "Phone Number": "Telefoonnummer",
     "Profile picture": "Profielfoto",
-    "<a>Upgrade</a> to your own domain": "<a>Waardeer op</a> naar uw eigen domein",
+    "<a>Upgrade</a> to your own domain": "<a>Upgrade</a> naar uw eigen domein",
     "Display Name": "Weergavenaam",
     "Set a new account password...": "Stel een nieuw accountwachtwoord in…",
     "Email addresses": "E-mailadressen",
@@ -1131,10 +1131,10 @@
     "Report bugs & give feedback": "Fouten melden & feedback geven",
     "Go back": "Terug",
     "Room Settings - %(roomName)s": "Gespreksinstellingen - %(roomName)s",
-    "Failed to upgrade room": "Gesprek bijwerken mislukt",
-    "The room upgrade could not be completed": "Het bijwerken van het gesprek kon niet voltooid worden",
-    "Upgrade this room to version %(version)s": "Werk dit gesprek bij tot versie %(version)s",
-    "Upgrade Room Version": "Gespreksversie bijwerken",
+    "Failed to upgrade room": "Gesprek upgraden mislukt",
+    "The room upgrade could not be completed": "Het upgraden van het gesprek kon niet voltooid worden",
+    "Upgrade this room to version %(version)s": "Upgrade dit gesprek tot versie %(version)s",
+    "Upgrade Room Version": "Gespreksversie upgraden",
     "Create a new room with the same name, description and avatar": "Een nieuw gesprek aanmaken met dezelfde naam, beschrijving en avatar",
     "Update any local room aliases to point to the new room": "Alle lokale gespreksbijnamen naar het nieuwe gesprek laten verwijzen",
     "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "Gebruikers verhinderen aan de oude versie van het gesprek bij te dragen, en daar een bericht plaatsen dat de gebruikers verwijst naar het nieuwe gesprek",
@@ -1196,8 +1196,8 @@
     "Sign in instead": "Aanmelden",
     "Your password has been reset.": "Uw wachtwoord is opnieuw ingesteld.",
     "Set a new password": "Stel een nieuw wachtwoord in",
-    "Invalid homeserver discovery response": "Ongeldig homeserver-ontdekkingsantwoord",
-    "Invalid identity server discovery response": "Ongeldig identiteitsserverontdekkingsantwoord",
+    "Invalid homeserver discovery response": "Ongeldig homeserver-vindbaarheids-antwoord",
+    "Invalid identity server discovery response": "Ongeldig identiteitsserver-vindbaarheidsantwoord",
     "General failure": "Algemene fout",
     "This homeserver does not support login using email address.": "Deze homeserver biedt geen ondersteuning voor inloggen met e-mailadres.",
     "Please <a>contact your service administrator</a> to continue using this service.": "Gelieve <a>contact op te nemen met uw dienstbeheerder</a> om deze dienst te blijven gebruiken.",
@@ -1238,7 +1238,7 @@
     "Please supply a https:// or http:// widget URL": "Voer een https://- of http://-widget-URL in",
     "You cannot modify widgets in this room.": "U kunt de widgets in dit gesprek niet aanpassen.",
     "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s heeft de uitnodiging aan %(targetDisplayName)s toe te treden tot het gesprek ingetrokken.",
-    "Upgrade this room to the recommended room version": "Werk dit gesprek bij tot de aanbevolen versie",
+    "Upgrade this room to the recommended room version": "Upgrade dit gesprek naar de aanbevolen gespreksversie",
     "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "Dit gesprek draait op groepsgespreksversie <roomVersion />, die door deze homeserver als <i>onstabiel</i> is gemarkeerd.",
     "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Upgraden zal de huidige versie van dit gesprek sluiten, en onder dezelfde naam een geüpgraded versie starten.",
     "Failed to revoke invite": "Intrekken van uitnodiging is mislukt",
@@ -1341,7 +1341,7 @@
     "Add room": "Gesprek toevoegen",
     "Your profile": "Uw profiel",
     "Your Matrix account on <underlinedServerName />": "Uw Matrix-account op <underlinedServerName />",
-    "Failed to get autodiscovery configuration from server": "Ophalen van auto-ontdekkingsconfiguratie van server is mislukt",
+    "Failed to get autodiscovery configuration from server": "Ophalen van auto-vindbaarheidsconfiguratie van server is mislukt",
     "Invalid base_url for m.homeserver": "Ongeldige base_url voor m.homeserver",
     "Homeserver URL does not appear to be a valid Matrix homeserver": "De homeserver-URL lijkt geen geldige Matrix-homeserver",
     "Invalid base_url for m.identity_server": "Ongeldige base_url voor m.identity_server",
@@ -1413,22 +1413,22 @@
     "Disconnect from the identity server <idserver />?": "Wilt u de verbinding met de identiteitsserver <idserver /> verbreken?",
     "Disconnect": "Verbinding verbreken",
     "Identity Server (%(server)s)": "Identiteitsserver (%(server)s)",
-    "You are currently using <server></server> to discover and be discoverable by existing contacts you know. You can change your identity server below.": "Om bekenden te kunnen vinden en door hen vindbaar te zijn gebruikt u momenteel <server></server>. U kunt die identiteitsserver hieronder wijzigen.",
+    "You are currently using <server></server> to discover and be discoverable by existing contacts you know. You can change your identity server below.": "Om bekenden te kunnen vinden en voor hen vindbaar te zijn gebruikt u momenteel <server></server>. U kunt die identiteitsserver hieronder wijzigen.",
     "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "U gebruikt momenteel geen identiteitsserver. Voeg er hieronder één toe om bekenden te kunnen vinden en voor hen vindbaar te zijn.",
-    "Disconnecting from your identity server will mean you won't be discoverable by other users and you won't be able to invite others by email or phone.": "De verbinding met uw identiteitsserver verbreken zal ertoe leiden dat u niet door andere gebruikers gevonden zal kunnen worden, en dat u anderen niet via e-mail of telefoon zal kunnen uitnodigen.",
+    "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.": "Als u de verbinding met uw identiteitsserver verbreekt zal u niet door andere personen gevonden kunnen worden, en dat u anderen niet via e-mail of telefoon zal kunnen uitnodigen.",
     "Integration Manager": "Integratiebeheerder",
-    "Discovery": "Ontdekking",
+    "Discovery": "Vindbaarheid",
     "Deactivate account": "Account sluiten",
     "Always show the window menu bar": "De venstermenubalk altijd tonen",
     "Unable to revoke sharing for email address": "Kan delen voor dit e-mailadres niet intrekken",
     "Unable to share email address": "Kan e-mailadres niet delen",
     "Revoke": "Intrekken",
     "Share": "Delen",
-    "Discovery options will appear once you have added an email above.": "Ontdekkingsopties zullen verschijnen wanneer u een e-mailadres hebt toegevoegd.",
+    "Discovery options will appear once you have added an email above.": "Vindbaarheidopties zullen verschijnen wanneer u een e-mailadres hebt toegevoegd.",
     "Unable to revoke sharing for phone number": "Kan delen voor dit telefoonnummer niet intrekken",
     "Unable to share phone number": "Kan telefoonnummer niet delen",
     "Please enter verification code sent via text.": "Voer de verificatiecode in die werd verstuurd via sms.",
-    "Discovery options will appear once you have added a phone number above.": "Ontdekkingsopties zullen verschijnen wanneer u een telefoonnummer hebt toegevoegd.",
+    "Discovery options will appear once you have added a phone number above.": "Vindbaarheidopties zullen verschijnen wanneer u een telefoonnummer hebt toegevoegd.",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "Er is een sms verstuurd naar +%(msisdn)s. Voor de verificatiecode in die in het bericht staat.",
     "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.",
@@ -1467,7 +1467,7 @@
     "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Aanvaard de gebruiksvoorwaarden van de identiteitsserver (%(serverName)s) om vindbaar te zijn op e-mailadres of telefoonnummer.",
     "Read Marker lifetime (ms)": "Levensduur van leesbevestigingen (ms)",
     "Read Marker off-screen lifetime (ms)": "Levensduur van levensbevestigingen, niet op scherm (ms)",
-    "Upgrade the room": "Werk het gesprek bij",
+    "Upgrade the room": "Upgrade het gesprek",
     "Enable room encryption": "Gespreksversleuteling inschakelen",
     "Error changing power level requirement": "Fout bij wijzigen van machtsniveauvereiste",
     "An error occurred changing the room's power level requirements. Ensure you have sufficient permissions and try again.": "Er is een fout opgetreden bij het wijzigen van de machtsniveauvereisten van het gesprek. Zorg ervoor dat u over voldoende machtigingen beschikt en probeer het opnieuw.",
@@ -1550,7 +1550,7 @@
     "%(creator)s created and configured the room.": "Gesprek gestart en ingesteld door %(creator)s.",
     "Setting up keys": "Sleutelconfiguratie",
     "Verify this session": "Deze sessie verifiëren",
-    "Encryption upgrade available": "Er is een bijgewerkte versleuteling beschikbaar",
+    "Encryption upgrade available": "Versleutelingsupgrade beschikbaar",
     "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "Typ <code>/help</code> om alle opdrachten te zien. Was het uw bedoeling dit als bericht te sturen?",
     "Help": "Hulp",
     "Set up encryption": "Versleuteling instellen",
@@ -1588,11 +1588,11 @@
     "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s heeft het patroon van een banregel wegens %(reason)s aangepast van %(oldGlob)s tot %(newGlob)s",
     "The message you are trying to send is too large.": "Uw bericht is te lang om te versturen.",
     "a few seconds ago": "enige tellen geleden",
-    "about a minute ago": "een minuut of zo geleden",
+    "about a minute ago": "ongeveer een minuut geleden",
     "%(num)s minutes ago": "%(num)s minuten geleden",
-    "about an hour ago": "een uur of zo geleden",
+    "about an hour ago": "ongeveer een uur geleden",
     "%(num)s hours ago": "%(num)s uur geleden",
-    "about a day ago": "een dag of zo geleden",
+    "about a day ago": "ongeveer een dag geleden",
     "%(num)s days ago": "%(num)s dagen geleden",
     "a few seconds from now": "over een paar tellen",
     "about a minute from now": "over een minuut of zo",
@@ -1602,7 +1602,7 @@
     "about a day from now": "over een dag of zo",
     "%(num)s days from now": "over %(num)s dagen",
     "%(name)s (%(userId)s)": "%(name)s (%(userId)s)",
-    "Try out new ways to ignore people (experimental)": "Nieuwe manieren om mensen te negeren uitproberen (nog in ontwikkeling)",
+    "Try out new ways to ignore people (experimental)": "Nieuwe manieren om personen te negeren uitproberen (nog in ontwikkeling)",
     "Show info about bridges in room settings": "Toon bruginformatie in gespreksinstellingen",
     "Match system theme": "Aanpassen aan systeemthema",
     "Never send encrypted messages to unverified sessions from this session": "Vanaf deze sessie nooit versleutelde berichten naar ongeverifieerde sessies versturen",
@@ -1629,7 +1629,7 @@
     "Channel: %(channelName)s": "Kanaal: %(channelName)s",
     "Show less": "Minder tonen",
     "Show more": "Meer tonen",
-    "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Momenteel stelt een wachtwoordswijziging alle berichtsleutels in alle sessies opnieuw in, en maakt zo oude versleutelde berichten onleesbaar - tenzij u uw sleutels eerst wegschrijft, en na afloop weer inleest. Dit zal verbeterd worden.",
+    "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Momenteel stelt een wachtwoordswijziging alle versleutelingssleutels in alle sessies opnieuw in, en maakt zo oude versleutelde berichten onleesbaar - tenzij u uw gesprekssleutels eerst opslaat, en na afloop weer inleest. Dit zal in de toekomst verbeterd worden.",
     "in memory": "in het geheugen",
     "not found": "niet gevonden",
     "Your homeserver does not support session management.": "Uw homeserver ondersteunt geen sessiebeheer.",
@@ -1698,7 +1698,7 @@
     "Session ID:": "Sessie-ID:",
     "Session key:": "Sessiesleutel:",
     "Message search": "Berichten zoeken",
-    "A session's public name is visible to people you communicate with": "De publieke naam van een sessie is zichtbaar voor de mensen waarmee u communiceert",
+    "A session's public name is visible to people you communicate with": "De openbare naam van een sessie is zichtbaar voor de personen waarmee u communiceert",
     "This room is bridging messages to the following platforms. <a>Learn more.</a>": "Dit gesprek wordt overbrugd naar de volgende platformen. <a>Lees meer</a>",
     "This room isn’t bridging messages to any platforms. <a>Learn more.</a>": "Dit gesprek wordt niet overbrugd naar andere platformen. <a>Lees meer.</a>",
     "Bridges": "Bruggen",
@@ -1846,7 +1846,7 @@
     "Reactions": "Reacties",
     "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> heeft gereageerd met %(content)s</reactedWith>",
     "Frequently Used": "Vaak gebruikt",
-    "Smileys & People": "Smileys & mensen",
+    "Smileys & People": "Smileys & Personen",
     "Animals & Nature": "Dieren en natuur",
     "Food & Drink": "Eten en drinken",
     "Activities": "Activiteiten",
@@ -1907,11 +1907,11 @@
     "If you didn’t sign in to this session, your account may be compromised.": "Als u zich niet heeft aangemeld bij deze sessie, is uw account wellicht geschonden.",
     "This wasn't me": "Dat was ik niet",
     "Automatically invite users": "Gebruikers automatisch uitnodigen",
-    "Upgrade private room": "Privégesprek bijwerken",
-    "Upgrade public room": "Openbaar gesprek bijwerken",
+    "Upgrade private room": "Privégesprek upgraden",
+    "Upgrade public room": "Openbaar gesprek upgraden",
     "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Het bijwerken van een gesprek is een gevorderde actie en wordt meestal aanbevolen wanneer een gesprek onstabiel is door fouten, ontbrekende functies of problemen met de beveiliging.",
     "This usually only affects how the room is processed on the server. If you're having problems with your %(brand)s, please <a>report a bug</a>.": "Dit heeft meestal enkel een invloed op de manier waarop het gesprek door de server verwerkt wordt. Als u problemen met uw %(brand)s ondervindt, <a>dien dan een foutmelding in</a>.",
-    "You'll upgrade this room from <oldVersion /> to <newVersion />.": "U werkt dit gesprek bij van <oldVersion /> naar <newVersion />.",
+    "You'll upgrade this room from <oldVersion /> to <newVersion />.": "U upgrade dit gesprek van <oldVersion /> naar <newVersion />.",
     "This will allow you to return to your account after signing out, and sign in on other sessions.": "Daardoor kunt u na afmelding terugkeren tot uw account, en u bij andere sessies aanmelden.",
     "Verification Request": "Verificatieverzoek",
     "Recovery key mismatch": "Herstelsleutel komt niet overeen",
@@ -1936,24 +1936,24 @@
     "Your new session is now verified. Other users will see it as trusted.": "Uw nieuwe sessie is nu geverifieerd. Ze zal voor andere gebruikers als vertrouwd gemarkeerd worden.",
     "Without completing security on this session, it won’t have access to encrypted messages.": "Als u de beveiliging van deze sessie niet vervolledigt, zal ze geen toegang hebben tot uw versleutelde berichten.",
     "Go Back": "Terugkeren",
-    "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "Door uw wachtwoord te wijzigen stelt u alle eind-tot-eind-versleutelingssleutels op al uw sessies opnieuw in, waardoor uw versleutelde gespreksgeschiedenis onleesbaar wordt. Stel sleutelback-up in of schrijf uw gesprekssleutels van een andere sessie weg vooraleer u een nieuw wachtwoord instelt.",
+    "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "Door uw wachtwoord te wijzigen stelt u alle eind-tot-eind-versleutelingssleutels op al uw sessies opnieuw in, waardoor uw versleutelde gespreksgeschiedenis onleesbaar wordt. Stel uw sleutelback-up in of sla uw gesprekssleutels van een andere sessie op voor u een nieuw wachtwoord instelt.",
     "You have been logged out of all sessions and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "U bent uitgelogd bij al uw sessies en zult geen pushberichten meer ontvangen. Meld u op elk apparaat opnieuw aan om meldingen opnieuw in te schakelen.",
-    "Regain access to your account and recover encryption keys stored in this session. Without them, you won’t be able to read all of your secure messages in any session.": "Herwin toegang tot uw account en herstel de tijdens deze sessie opgeslagen versleutelingssleutels, zonder welke sommige van uw beveiligde berichten in al uw sessies onleesbaar zijn.",
+    "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.": "Ontvang toegang tot uw account en herstel de tijdens deze sessie opgeslagen versleutelingssleutels, zonder deze sleutels zijn sommige van uw versleutelde berichten in uw sessies onleesbaar.",
     "Warning: Your personal data (including encryption keys) is still stored in this session. Clear it if you're finished using this session, or want to sign in to another account.": "Let op: uw persoonlijke gegevens (waaronder versleutelingssleutels) zijn nog steeds opgeslagen in deze sessie. Wis ze wanneer u klaar bent met deze sessie, of wanneer u zich wilt aanmelden met een andere account.",
     "Command Autocomplete": "Opdrachten autoaanvullen",
     "DuckDuckGo Results": "DuckDuckGo-resultaten",
-    "Enter your account password to confirm the upgrade:": "Voer uw accountwachtwoord in om het bijwerken te bevestigen:",
-    "Restore your key backup to upgrade your encryption": "Herstel uw sleutelback-up om uw versleuteling bij te werken",
+    "Enter your account password to confirm the upgrade:": "Voer uw accountwachtwoord in om het upgraden te bevestigen:",
+    "Restore your key backup to upgrade your encryption": "Herstel uw sleutelback-up om uw versleuteling te upgraden",
     "Restore": "Herstellen",
-    "You'll need to authenticate with the server to confirm the upgrade.": "U zult zich moeten aanmelden bij de server om het bijwerken te bevestigen.",
-    "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Werk deze sessie bij om er andere sessies mee te verifiëren, waardoor deze ook de toegang verkrijgen tot uw versleutelde berichten en voor andere gebruikers als vertrouwd gemarkeerd worden.",
+    "You'll need to authenticate with the server to confirm the upgrade.": "U zult zich moeten aanmelden bij de server om het upgraden te bevestigen.",
+    "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Upgrade deze sessie om er andere sessies mee te verifiëren, waardoor deze ook de toegang verkrijgen tot uw versleutelde berichten en deze voor andere gebruikers als vertrouwd gemarkeerd worden.",
     "Set up with a recovery key": "Instellen met een herstelsleutel",
     "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Bewaar een kopie op een veilige plaats, zoals in een wachtwoordbeheerder of een kluis.",
     "Your recovery key": "Uw herstelsleutel",
     "Copy": "Kopiëren",
     "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "Uw herstelsleutel is <b>gekopieerd naar uw klembord</b>, plak hem en:",
     "Your recovery key is in your <b>Downloads</b> folder.": "Uw herstelsleutel bevindt zich in uw <b>Downloads</b>-map.",
-    "Upgrade your encryption": "Werk uw versleuteling bij",
+    "Upgrade your encryption": "Upgrade uw versleuteling",
     "Make a copy of your recovery key": "Maak een kopie van uw herstelsleutel",
     "Unable to set up secret storage": "Kan sleutelopslag niet instellen",
     "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another session.": "Zonder veilig berichtherstel in te stellen zult u uw versleutelde berichtgeschiedenis niet kunnen herstellen als u uitlogt of een andere sessie gebruikt.",
@@ -2465,7 +2465,7 @@
     "Send %(count)s invites|one": "Stuur %(count)s uitnodiging",
     "Send %(count)s invites|other": "Stuur %(count)s uitnodigingen",
     "Show": "Toon",
-    "People you know on %(brand)s": "Mensen die u kent van %(brand)s",
+    "People you know on %(brand)s": "Personen die u kent van %(brand)s",
     "Add another email": "Nog een e-mailadres toevoegen",
     "Download logs": "Download logboeken",
     "Add a new server...": "Een nieuwe server toevoegen…",
@@ -2508,7 +2508,7 @@
     "Role": "Rol",
     "Room settings": "Gespreksinstellingen",
     "Show files": "Bestanden tonen",
-    "%(count)s people|other": "%(count)s mensen",
+    "%(count)s people|other": "%(count)s personen",
     "About": "Over",
     "Not encrypted": "Niet versleuteld",
     "Widgets": "Widgets",
@@ -2533,7 +2533,7 @@
     "Signature upload failed": "Versturen van ondertekening mislukt",
     "Signature upload success": "Ondertekening succesvol verstuurd",
     "Unable to upload": "Versturen niet mogelijk",
-    "Transfer": "Overdragen",
+    "Transfer": "Doorschakelen",
     "Start a conversation with someone using their name or username (like <userId/>).": "Start een gesprek met iemand door hun naam of gebruikersnaam (zoals <userId/>) te typen.",
     "May include members not in %(communityName)s": "Mag deelnemers bevatten die geen deel uitmaken van %(communityName)s",
     "Invite by email": "Via e-mail uitnodigen",
@@ -2697,37 +2697,37 @@
     "Navigation": "Navigatie",
     "Currently indexing: %(currentRoom)s": "Momenteel indexeren: %(currentRoom)s",
     "Enter your recovery passphrase a second time to confirm it.": "Voer uw Herstelwachtwoord een tweede keer in om te bevestigen.",
-    "This session has detected that your Security Phrase and key for Secure Messages have been removed.": "Deze sessie heeft ontdekt dat uw veiligheidszin en sleutel voor versleutelde berichten zijn verwijderd.",
-    "A new Security Phrase and key for Secure Messages have been detected.": "Er is een nieuwe veiligheidszin en sleutel voor versleutelde berichten gedetecteerd.",
+    "This session has detected that your Security Phrase and key for Secure Messages have been removed.": "Deze sessie heeft ontdekt dat uw veiligheidswachtwoord en -sleutel voor versleutelde berichten zijn verwijderd.",
+    "A new Security Phrase and key for Secure Messages have been detected.": "Er is een nieuwe veiligheidswachtwoord en -sleutel voor versleutelde berichten gedetecteerd.",
     "Save your Security Key": "Uw veiligheidssleutel opslaan",
-    "Confirm Security Phrase": "Veiligheidszin bevestigen",
-    "Set a Security Phrase": "Een veiligheidszin instellen",
+    "Confirm Security Phrase": "Veiligheidswachtwoord bevestigen",
+    "Set a Security Phrase": "Een veiligheidswachtwoord instellen",
     "You can also set up Secure Backup & manage your keys in Settings.": "U kunt ook een beveiligde back-up instellen en uw sleutels beheren via instellingen.",
     "Secure Backup": "Beveiligde back-up",
-    "Unable to access secret storage. Please verify that you entered the correct Security Phrase.": "Geen toegang tot sleutelopslag. Controleer of u de juiste veiligheidszin hebt ingevoerd.",
+    "Unable to access secret storage. Please verify that you entered the correct Security Phrase.": "Geen toegang tot geheime opslag. Controleer of u het juiste veiligheidswachtwoord hebt ingevoerd.",
     "Secret storage:": "Sleutelopslag:",
     "Unable to query secret storage status": "Kan status sleutelopslag niet opvragen",
     "Store your Security Key somewhere safe, like a password manager or a safe, as it’s used to safeguard your encrypted data.": "Bewaar uw veiligheidssleutel op een veilige plaats, zoals in een wachtwoordmanager of een kluis, aangezien deze wordt gebruikt om uw versleutelde gegevens te beveiligen.",
     "Confirm your recovery passphrase": "Bevestig uw Herstelwachtwoord",
     "Use a different passphrase?": "Gebruik een ander wachtwoord?",
-    "Enter a security phrase only you know, as it’s used to safeguard your data. To be secure, you shouldn’t re-use your account password.": "Voer een veiligheidszin in die alleen u kent, aangezien deze wordt gebruikt om uw gegevens te versleutelen. Om veilig te zijn, moet u het wachtwoord van uw account niet opnieuw gebruiken.",
+    "Enter a security phrase only you know, as it’s used to safeguard your data. To be secure, you shouldn’t re-use your account password.": "Voer een veiligheidswachtwoord in die alleen u kent, aangezien deze wordt gebruikt om uw gegevens te versleutelen. Om veilig te zijn, moet u het wachtwoord van uw account niet opnieuw gebruiken.",
     "Safeguard against losing access to encrypted messages & data by backing up encryption keys on your server.": "Bescherm uw server tegen toegangsverlies tot versleutelde berichten en gegevens door een back-up te maken van de versleutelingssleutels.",
-    "Use a secret phrase only you know, and optionally save a Security Key to use for backup.": "Gebruik een veiligheidszin die alleen u kent, en sla optioneel een veiligheidssleutel op om te gebruiken als back-up.",
+    "Use a secret phrase only you know, and optionally save a Security Key to use for backup.": "Gebruik een veiligheidswachtwoord die alleen u kent, en sla optioneel een veiligheidssleutel op om te gebruiken als back-up.",
     "We’ll generate a Security Key for you to store somewhere safe, like a password manager or a safe.": "Wij maken een veiligheidssleutel voor u aan die u ergens veilig kunt opbergen, zoals in een wachtwoordmanager of een kluis.",
     "Generate a Security Key": "Genereer een veiligheidssleutel",
     "Make a copy of your Security Key": "Maak een kopie van uw veiligheidssleutel",
-    "Confirm your Security Phrase": "Bevestig uw veiligheidszin",
-    "Secure your backup with a Security Phrase": "Beveilig uw back-up met een veiligheidszin",
+    "Confirm your Security Phrase": "Bevestig uw veiligheidswachtwoord",
+    "Secure your backup with a Security Phrase": "Beveilig uw back-up met een veiligheidswachtwoord",
     "Your Security Key is in your <b>Downloads</b> folder.": "Uw veiligheidssleutel staat in uw <b>Downloads</b>-map.",
     "Your Security Key has been <b>copied to your clipboard</b>, paste it to:": "Uw veiligheidssleutel is <b>gekopieerd naar uw klembord</b>, plak het in:",
     "Your Security Key": "Uw veiligheidssleutel",
-    "Your Security Key is a safety net - you can use it to restore access to your encrypted messages if you forget your Security Phrase.": "Uw veiligheidssleutel is een vangnet - u kunt hem gebruiken om de toegang tot uw versleutelde berichten te herstellen als u uw veiligheidszin bent vergeten.",
-    "Repeat your Security Phrase...": "Herhaal uw veiligheidszin...",
-    "Please enter your Security Phrase a second time to confirm.": "Voer uw veiligheidszin een tweede keer in om te bevestigen.",
+    "Your Security Key is a safety net - you can use it to restore access to your encrypted messages if you forget your Security Phrase.": "Uw veiligheidssleutel is een vangnet - u kunt hem gebruiken om de toegang tot uw versleutelde berichten te herstellen als u uw veiligheidswachtwoord bent vergeten.",
+    "Repeat your Security Phrase...": "Herhaal uw veiligheidswachtwoord...",
+    "Please enter your Security Phrase a second time to confirm.": "Voer uw veiligheidswachtwoord een tweede keer in om deze te bevestigen.",
     "Set up with a Security Key": "Instellen met een veiligheidssleutel",
-    "Great! This Security Phrase looks strong enough.": "Geweldig. Deze veiligheidszin ziet er sterk genoeg uit.",
-    "Enter a Security Phrase": "Veiligheidszin invoeren",
-    "We'll store an encrypted copy of your keys on our server. Secure your backup with a Security Phrase.": "Wij bewaren een versleutelde kopie van uw sleutels op onze server. Beveilig uw back-up met een veiligheidszin.",
+    "Great! This Security Phrase looks strong enough.": "Geweldig. Dit veiligheidswachtwoord ziet er sterk genoeg uit.",
+    "Enter a Security Phrase": "Veiligheidswachtwoord invoeren",
+    "We'll store an encrypted copy of your keys on our server. Secure your backup with a Security Phrase.": "Wij bewaren een versleutelde kopie van uw sleutels op onze server. Beveilig uw back-up met een veiligheidswachtwoord.",
     "or another cross-signing capable Matrix client": "of een andere Matrix-client die kruislings kan ondertekenen",
     "%(brand)s Android": "%(brand)s Android",
     "%(brand)s iOS": "%(brand)s iOS",
@@ -2735,7 +2735,7 @@
     "%(brand)s Web": "%(brand)s Web",
     "This requires the latest %(brand)s on your other devices:": "Dit vereist de nieuwste %(brand)s op uw andere toestellen:",
     "Use Security Key": "Gebruik veiligheidssleutel",
-    "Use Security Key or Phrase": "Gebruik veiligheidssleutel of -zin",
+    "Use Security Key or Phrase": "Gebruik veiligheidssleutel of -wachtwoord",
     "Decide where your account is hosted": "Kies waar uw account wordt gehost",
     "Host account on": "Host uw account op",
     "Already have an account? <a>Sign in here</a>": "Heeft u al een account? <a>Aanmelden</a>",
@@ -2768,8 +2768,8 @@
     "Upgrade to pro": "Upgrade naar pro",
     "Now, let's help you get started": "Laten we u helpen om te beginnen",
     "Welcome %(name)s": "Welkom %(name)s",
-    "Add a photo so people know it's you.": "Voeg een foto toe zodat mensen weten dat u het bent.",
-    "Great, that'll help people know it's you": "Geweldig, dat zal mensen helpen te weten dat u het bent",
+    "Add a photo so people know it's you.": "Voeg een foto toe zodat personen weten dat u het bent.",
+    "Great, that'll help people know it's you": "Geweldig, dan zullen personen weten dat u het bent",
     "<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 add images with Matrix URLs <img src=\"mxc://url\" />\n</p>\n": "<h1>HTML voor de pagina van uw gemeenschap</h1>\n<p>\nGebruik de lange beschrijving om nieuwe deelnemers voor te stellen aan de gemeenschap, of verspreid enkele belangrijke <a href=\"foo\">links</a>\n</p>\n<p>\nU kunt zelfs afbeeldingen toevoegen met Matrix URL's <img src=\"mxc://url\" />\n</p>\n",
     "Create community": "Gemeenschap aanmaken",
     "Attach files from chat or just drag and drop them anywhere in a room.": "Voeg bestanden toe vanuit het gesprek of sleep ze in een gesprek.",
@@ -2797,13 +2797,13 @@
     "Not a valid Security Key": "Geen geldige veiligheidssleutel",
     "This looks like a valid Security Key!": "Dit lijkt op een geldige veiligheidssleutel!",
     "Enter Security Key": "Veiligheidssleutel invoeren",
-    "If you've forgotten your Security Phrase you can <button1>use your Security Key</button1> or <button2>set up new recovery options</button2>": "Als u uw Herstelwachtwoord bent vergeten, kunt u <button1>uw Herstelsleutel gebruiken</button1> of <button2>nieuwe herstelopties instellen</button2>",
-    "Access your secure message history and set up secure messaging by entering your Security Phrase.": "Ga naar uw veilige berichtengeschiedenis en stel veilige berichten in door uw veiligheidszin in te voeren.",
-    "Enter Security Phrase": "Voer veiligheidszin in",
+    "If you've forgotten your Security Phrase you can <button1>use your Security Key</button1> or <button2>set up new recovery options</button2>": "Als u uw veiligheidswachtwoord bent vergeten, kunt u <button1>uw veiligheidssleutel gebruiken</button1> of <button2>nieuwe herstelopties instellen</button2>",
+    "Access your secure message history and set up secure messaging by entering your Security Phrase.": "Ga naar uw versleutelde berichtengeschiedenis en stel versleutelde berichten in door uw veiligheidswachtwoord in te voeren.",
+    "Enter Security Phrase": "Veiligheidswachtwoord invoeren",
     "Successfully restored %(sessionCount)s keys": "Succesvol %(sessionCount)s sleutels hersteld",
     "Keys restored": "Sleutels hersteld",
-    "Backup could not be decrypted with this Security Phrase: please verify that you entered the correct Security Phrase.": "Back-up kon niet worden gedecodeerd met deze veiligheidszin: controleer of u de juiste veiligheidszin hebt ingevoerd.",
-    "Incorrect Security Phrase": "Onjuiste veiligheidszin",
+    "Backup could not be decrypted with this Security Phrase: please verify that you entered the correct Security Phrase.": "Back-up kon niet worden ontsleuteld met dit veiligheidswachtwoord: controleer of u het juiste veiligheidswachtwoord hebt ingevoerd.",
+    "Incorrect Security Phrase": "Onjuist Veiligheidswachtwoord",
     "Backup could not be decrypted with this Security Key: please verify that you entered the correct Security Key.": "Back-up kon niet worden ontcijferd met deze veiligheidssleutel: controleer of u de juiste veiligheidssleutel hebt ingevoerd.",
     "Security Key mismatch": "Verkeerde veiligheidssleutel",
     "%(completed)s of %(total)s keys restored": "%(completed)s van %(total)s sleutels hersteld",
@@ -2814,8 +2814,8 @@
     "Confirm encryption setup": "Bevestig versleuting instelling",
     "Use your Security Key to continue.": "Gebruik uw veiligheidssleutel om verder te gaan.",
     "Security Key": "Veiligheidssleutel",
-    "Enter your Security Phrase or <button>Use your Security Key</button> to continue.": "Voer uw veiligheidszin in of <button>gebruik uw veiligheidssleutel</button> om verder te gaan.",
-    "Security Phrase": "Veiligheidszin",
+    "Enter your Security Phrase or <button>Use your Security Key</button> to continue.": "Voer uw veiligheidswachtwoord in of <button>gebruik uw veiligheidssleutel</button> om verder te gaan.",
+    "Security Phrase": "Veiligheidswachtwoord",
     "Invalid Security Key": "Ongeldige veiligheidssleutel",
     "Wrong Security Key": "Verkeerde veiligheidssleutel",
     "Looks good!": "Ziet er goed uit!",
@@ -2869,11 +2869,11 @@
     "Upload completed": "Upload voltooid",
     "Maximize dialog": "Maximaliseer dialoog",
     "%(hostSignupBrand)s Setup": "%(hostSignupBrand)s Installatie",
-    "You should know": "U moet weten",
+    "You should know": "Dit moet u weten",
     "Privacy Policy": "Privacystatement",
     "Cookie Policy": "Cookiebeleid",
-    "Abort": "Annuleren",
-    "Confirm abort of host creation": "Bevestig het annuleren van de host creatie",
+    "Abort": "Afbreken",
+    "Confirm abort of host creation": "Bevestig het afbreken van host creatie",
     "You might enable this if the room will only be used for collaborating with internal teams on your homeserver. This cannot be changed later.": "U zou dit kunnen aanzetten als dit gesprek alleen gebruikt zal worden voor samenwerking met interne teams op uw homeserver. Dit kan later niet meer veranderd worden.",
     "You can’t disable this later. Bridges & most bots won’t work yet.": "U kunt dit later niet uitschakelen. Bruggen en de meeste bots zullen nog niet werken.",
     "There was an error creating your community. The name may be taken or the server is unable to process your request.": "Er is een fout opgetreden bij het aanmaken van uw gemeenschap. De naam kan bezet zijn of de server is niet in staat om uw aanvraag te verwerken.",
@@ -2887,7 +2887,7 @@
     "Screens": "Schermen",
     "Share your screen": "Uw scherm delen",
     "Submit logs": "Logs versturen",
-    "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "Berichten in dit gesprek zijn eind-tot-eind-versleuteld. Als mensen deelnemen, kan u ze verifiëren in hun profiel, tik gewoon op hun avatar.",
+    "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "Berichten in dit gesprek zijn eind-tot-eind-versleuteld. Als personen deelnemen, kan u ze verifiëren in hun profiel, tik hiervoor op hun avatar.",
     "In encrypted rooms, verify all users to ensure it’s secure.": "Controleer alle gebruikers in versleutelde gesprekken om er zeker van te zijn dat het veilig is.",
     "Verify all users in a room to ensure it's secure.": "Controleer alle gebruikers in een gesprek om er zeker van te zijn dat hij veilig is.",
     "%(count)s people|one": "%(count)s persoon",
@@ -2903,7 +2903,7 @@
     "Use the + to make a new room or explore existing ones below": "Gebruik de + om een nieuw gesprek te starten of ontdek de bestaande groepen hieronder",
     "Open dial pad": "Kiestoetsen openen",
     "Recently visited rooms": "Onlangs geopende gesprekken",
-    "Add a photo, so people can easily spot your room.": "Voeg een foto toe, zodat mensen je gemakkelijk kunnen herkennen in het gesprek.",
+    "Add a photo, so people can easily spot your room.": "Voeg een foto toe, zodat personen u gemakkelijk kunnen herkennen in het gesprek.",
     "Only the two of you are in this conversation, unless either of you invites anyone to join.": "Alleen u beiden nemen deel aan dit gesprek, tenzij een van u beiden iemand uitnodigt om deel te nemen.",
     "Emoji picker": "Emoji kiezer",
     "Room ID or address of ban list": "Gesprek-ID of het adres van de banlijst",
@@ -2916,7 +2916,7 @@
     "Hey you. You're the best!": "Hey. U bent de beste!",
     "Backup key cached:": "Back-up sleutel cached:",
     "Backup key stored:": "Back-up sleutel bewaard:",
-    "Back up your encryption keys with your account data in case you lose access to your sessions. Your keys will be secured with a unique Security Key.": "Maak een back-up van uw encryptiesleutels met uw accountgegevens voor het geval u de toegang tot uw sessies verliest. Uw sleutels worden beveiligd met een unieke veiligheidssleutel.",
+    "Back up your encryption keys with your account data in case you lose access to your sessions. Your keys will be secured with a unique Security Key.": "Maak een back-up van uw versleutelingssleutels met uw accountgegevens voor het geval u de toegang tot uw sessies verliest. Uw sleutels worden beveiligd met een unieke veiligheidssleutel.",
     "well formed": "goed gevormd",
     "%(brand)s can't securely cache encrypted messages locally while running in a web browser. Use <desktopLink>%(brand)s Desktop</desktopLink> for encrypted messages to appear in search results.": "%(brand)s kan versleutelde berichten niet veilig lokaal opslaan in een webbrowser. Gebruik <desktopLink>%(brand)s Desktop</desktopLink> om versleutelde berichten in zoekresultaten te laten verschijnen.",
     "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "Veilig lokaal opslaan van versleutelde berichten zodat ze in de zoekresultaten verschijnen, gebruik %(size)s voor het opslaan van berichten uit %(rooms)s gesprek.",
@@ -2950,7 +2950,7 @@
     "Create a Group Chat": "Maak een groepsgesprek aan",
     "Send a Direct Message": "Start een direct gesprek",
     "Welcome to %(appName)s": "Welkom bij %(appName)s",
-    "<a>Add a topic</a> to help people know what it is about.": "<a>Stel een gespreksonderwerp in</a> zodat mensen weten waar het over gaat.",
+    "<a>Add a topic</a> to help people know what it is about.": "<a>Stel een gespreksonderwerp in</a> zodat de personen weten waar het over gaat.",
     "Upgrade to %(hostSignupBrand)s": "Upgrade naar %(hostSignupBrand)s",
     "Edit Values": "Waarde wijzigen",
     "Values at explicit levels in this room:": "Waarde op expliciete niveaus in dit gesprek:",
@@ -2972,5 +2972,120 @@
     "Setting ID": "Instellingen-ID",
     "Failed to save settings": "Kan geen instellingen opslaan",
     "Settings Explorer": "Instellingen Ontdekken",
-    "Show chat effects (animations when receiving e.g. confetti)": "Effecten tonen (animaties bij ontvangst bijv. confetti)"
+    "Show chat effects (animations when receiving e.g. confetti)": "Effecten tonen (animaties bij ontvangst bijv. confetti)",
+    "Jump to the bottom of the timeline when you send a message": "Naar de onderkant van de tijdlijn springen wanneer u een bericht verstuurd",
+    "Original event source": "Originele gebeurtenisbron",
+    "Decrypted event source": "Ontsleutel de gebeurtenisbron",
+    "We'll create rooms for each of them. You can add existing rooms after setup.": "We maken gesprekken voor elk van hen. U kunt bestaande gesprekken toevoegen na het instellen.",
+    "What projects are you working on?": "Aan welke projecten werkt u?",
+    "We'll create rooms for each topic.": "We maken gesprekken voor elk onderwerp.",
+    "What are some things you want to discuss?": "Wat zijn dingen die u wilt bespreken?",
+    "Inviting...": "Uitnodigen...",
+    "Invite by username": "Op gebruikersnaam uitnodigen",
+    "Invite your teammates": "Uw teamgenoten uitnodigen",
+    "Failed to invite the following users to your space: %(csvUsers)s": "Het uitnodigen van de volgende gebruikers voor uw space is mislukt: %(csvUsers)s",
+    "A private space for you and your teammates": "Een privé space voor u en uw teamgenoten",
+    "Me and my teammates": "Ik en mijn teamgenoten",
+    "A private space just for you": "Een privé space alleen voor u",
+    "Just Me": "Alleen Ik",
+    "Ensure the right people have access to the space.": "Zorg ervoor dat de juiste personen toegang hebben tot deze space.",
+    "Who are you working with?": "Met wie werkt u samen?",
+    "Finish": "Voltooien",
+    "At the moment only you can see it.": "Op dit moment kan u deze alleen zien.",
+    "Creating rooms...": "Gesprekken aanmaken...",
+    "Skip for now": "Voorlopig overslaan",
+    "Failed to create initial space rooms": "Het maken van de space gesprekken is mislukt",
+    "Room name": "Gespreksnaam",
+    "Support": "Ondersteuning",
+    "Random": "Willekeurig",
+    "Welcome to <name/>": "Welkom in <name/>",
+    "Your private space <name/>": "Uw privé space <name/>",
+    "Your public space <name/>": "Uw openbare space <name/>",
+    "You have been invited to <name/>": "U bent uitgenodigd voor <name/>",
+    "<inviter/> invited you to <name/>": "<inviter/> heeft u uitgenodigd voor <name/>",
+    "%(count)s members|other": "%(count)s personen",
+    "%(count)s members|one": "%(count)s persoon",
+    "Your server does not support showing space hierarchies.": "Uw server heeft geen ondersteuning voor het weergeven van space indelingen.",
+    "Default Rooms": "Standaard Gesprekken",
+    "Add existing rooms & spaces": "Bestaande gesprekken en spaces toevoegen",
+    "Accept Invite": "Uitnodiging Accepteren",
+    "Find a room...": "Vind een gesprek...",
+    "Manage rooms": "Gesprekken beheren",
+    "Promoted to users": "Gepromoot aan gebruikers",
+    "Save changes": "Wijzigingen opslaan",
+    "You're in this room": "U bent in dit gesprek",
+    "You're in this space": "U bent in deze space",
+    "No permissions": "Geen rechten",
+    "Remove from Space": "Van space verwijderen",
+    "Undo": "Ongedaan maken",
+    "Your message wasn't sent because this homeserver has been blocked by it's administrator. Please <a>contact your service administrator</a> to continue using the service.": "Uw bericht is niet verstuurd, omdat deze homeserver is geblokkeerd door zijn beheerder. Gelieve <a>contact op te nemen met uw beheerder</a> om de dienst te blijven gebruiken.",
+    "Are you sure you want to leave the space '%(spaceName)s'?": "Weet u zeker dat u de space '%(spaceName)s' wilt verlaten?",
+    "This space is not public. You will not be able to rejoin without an invite.": "Deze space is niet openbaar. Zonder uitnodiging zult u niet opnieuw kunnen toetreden.",
+    "Start audio stream": "Audio-stream starten",
+    "Failed to start livestream": "Starten van livestream is mislukt",
+    "Unable to start audio streaming.": "Kan audio-streaming niet starten.",
+    "Save Changes": "Wijzigingen Opslaan",
+    "Saving...": "Opslaan...",
+    "View dev tools": "Bekijk dev tools",
+    "Leave Space": "Space verlaten",
+    "Make this space private": "Maak deze space privé",
+    "Failed to save space settings.": "Het opslaan van de space-instellingen is mislukt.",
+    "Space settings": "Space-instellingen",
+    "Edit settings relating to your space.": "Bewerk instellingen gerelateerd aan uw space.",
+    "Invite someone using their name, username (like <userId/>) or <a>share this space</a>.": "Nodig iemand uit per naam, gebruikersnaam (zoals <userId/>) of <a>deel deze space</a>.",
+    "Invite someone using their name, email address, username (like <userId/>) or <a>share this space</a>.": "Nodig iemand uit per naam, e-mailadres, gebruikersnaam (zoals <userId/>) of <a>deel deze space</a>.",
+    "Unnamed Space": "Naamloze Space",
+    "Invite to %(spaceName)s": "Voor %(spaceName)s uitnodigen",
+    "Failed to add rooms to space": "Het toevoegen van gesprekken aan de space is mislukt",
+    "Apply": "Toepassen",
+    "Applying...": "Toepassen...",
+    "Create a new room": "Een nieuw gesprek aanmaken",
+    "Don't want to add an existing room?": "Wilt u geen bestaand gesprek toevoegen?",
+    "Spaces": "Spaces",
+    "Filter your rooms and spaces": "Gesprekken en spaces filteren",
+    "Add existing spaces/rooms": "Bestaande spaces/gesprekken toevoegen",
+    "Space selection": "Space-selectie",
+    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the space it will be impossible to regain privileges.": "U kunt deze wijziging niet ongedaan maken omdat u uzelf rechten ontneemt, als u de laatste bevoegde gebruiker in de ruimte bent zal het onmogelijk zijn om weer rechten te krijgen.",
+    "Empty room": "Leeg gesprek",
+    "Suggested Rooms": "Gespreksuggesties",
+    "Explore space rooms": "Space-gesprekken ontdekken",
+    "You do not have permissions to add rooms to this space": "U hebt geen toestemming om gesprekken toe te voegen in deze space",
+    "Add existing room": "Bestaande gesprekken toevoegen",
+    "You do not have permissions to create new rooms in this space": "U hebt geen toestemming om gesprekken te maken in deze space",
+    "Send message": "Bericht versturen",
+    "Invite to this space": "Uitnodigen voor deze space",
+    "Your message was sent": "Uw bericht is verstuurd",
+    "Encrypting your message...": "Uw bericht versleutelen...",
+    "Sending your message...": "Uw bericht versturen...",
+    "Spell check dictionaries": "Spellingscontrole woordenboeken",
+    "Space options": "Space-opties",
+    "Space Home": "Space Thuis",
+    "New room": "Nieuw gesprek",
+    "Leave space": "Space verlaten",
+    "Invite people": "Personen uitnodigen",
+    "Share your public space": "Deel uw publieke space",
+    "Invite members": "Leden uitnodigen",
+    "Invite by email or username": "Uitnodigen per e-mail of gebruikersnaam",
+    "Share invite link": "Deel uitnodigingskoppeling",
+    "Click to copy": "Klik om te kopiëren",
+    "Collapse space panel": "Space-paneel invouwen",
+    "Expand space panel": "Space-paneel uitvouwen",
+    "Creating...": "Aanmaken...",
+    "You can change these at any point.": "U kan dit op elk moment aanpassen.",
+    "Give it a photo, name and description to help you identify it.": "Geef het een foto, naam en omschrijving om u te helpen het te herkennen.",
+    "Your private space": "Uw privé space",
+    "Your public space": "Uw openbare space",
+    "You can change this later": "U kan dit later aanpassen",
+    "Invite only, best for yourself or teams": "Alleen op uitnodiging, geschikt voor uzelf of teams",
+    "Private": "Privé",
+    "Open space for anyone, best for communities": "Openbare space voor iedereen, geschikt voor gemeenschappen",
+    "Public": "Openbaar",
+    "Spaces are new ways to group rooms and people. To join an existing space you’ll need an invite": "Spaces is een nieuwe manier van groeperen van gesprekken en personen. Om deel te nemen aan een bestaande space heeft u een uitnodiging nodig",
+    "Create a space": "Space aanmaken",
+    "Delete": "Verwijderen",
+    "Spaces prototype. Incompatible with Communities, Communities v2 and Custom Tags. Requires compatible homeserver for some features.": "Spaces prototype. Niet compatibel met Gemeenschappen, Gemeenschappen v2 en Aangepaste Labels. Vereist een geschikte homeserver voor sommige functies.",
+    "This homeserver has been blocked by it's administrator.": "Deze homeserver is geblokkeerd door zijn beheerder.",
+    "This homeserver has been blocked by its administrator.": "Deze homeserver is geblokkeerd door uw beheerder.",
+    "Already in call": "Al in gesprek",
+    "You're already in a call with this person.": "U bent al in gesprek met deze persoon."
 }

From 976bf0192a00ab45d5fda12f01d07e0b541400f2 Mon Sep 17 00:00:00 2001
From: Marcelo Filho <marceloaof@protonmail.com>
Date: Thu, 11 Mar 2021 20:02:37 +0000
Subject: [PATCH 335/420] Translated using Weblate (Portuguese (Brazil))

Currently translated at 96.6% (2792 of 2889 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/pt_BR/
---
 src/i18n/strings/pt_BR.json | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index ef748c5fd8..f054fa31e6 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -3019,5 +3019,23 @@
     "Value": "Valor",
     "Failed to save settings": "Falha ao salvar as configurações",
     "Show chat effects (animations when receiving e.g. confetti)": "Mostrar efeitos na conversa (por exemplo: animações ao receber confetes)",
-    "Element Web is experimental on mobile. For a better experience and the latest features, use our free native app.": "O Element Web é experimental para dispositivos móveis. Para uma melhor experiência e os recursos mais recentes, use nosso aplicativo gratuito."
+    "Element Web is experimental on mobile. For a better experience and the latest features, use our free native app.": "O Element Web é experimental para dispositivos móveis. Para uma melhor experiência e os recursos mais recentes, use nosso aplicativo gratuito.",
+    "Empty room": "Sala vazia",
+    "Suggested Rooms": "Salas sugeridas",
+    "Add existing room": "Adicionar sala existente",
+    "Send message": "Enviar mensagem",
+    "Just Me": "Somente eu",
+    "Finish": "Concluir",
+    "Creating rooms...": "Criando salas...",
+    "Skip for now": "Ignorar por enquanto",
+    "Room name": "Nome da sala",
+    "Random": "Aleatório",
+    "Welcome to <name/>": "Boas-vindas ao <name/>",
+    "Creating...": "Criando...",
+    "Private": "Privado",
+    "Public": "Público",
+    "Delete": "Excluir",
+    "This homeserver has been blocked by it's administrator.": "Este servidor local foi bloqueado pelo seu administrador.",
+    "This homeserver has been blocked by its administrator.": "Este servidor local foi bloqueado pelo seu administrador.",
+    "You're already in a call with this person.": "Você já está em uma chamada com essa pessoa."
 }

From d57c1b406c2af3d6d3795392330fafb6c87fefa8 Mon Sep 17 00:00:00 2001
From: LinAGKar <linus.kardell@gmail.com>
Date: Sat, 13 Mar 2021 12:44:34 +0000
Subject: [PATCH 336/420] Translated using Weblate (Swedish)

Currently translated at 100.0% (2889 of 2889 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sv/
---
 src/i18n/strings/sv.json | 117 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 116 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index c8a5a41339..002b825cb0 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -3018,5 +3018,120 @@
     "Setting ID": "Inställnings-ID",
     "Failed to save settings": "Misslyckades att spara inställningar",
     "Settings Explorer": "Inställningsutforskare",
-    "Show chat effects (animations when receiving e.g. confetti)": "Visa chatteffekter (animeringar när du tar emot t.ex. konfetti)"
+    "Show chat effects (animations when receiving e.g. confetti)": "Visa chatteffekter (animeringar när du tar emot t.ex. konfetti)",
+    "Original event source": "Ursprunglig händelsekällkod",
+    "Decrypted event source": "Avkrypterad händelsekällkod",
+    "We'll create rooms for each of them. You can add existing rooms after setup.": "Vi kommer att skapa rum för varje. Du kan lägga till existerande rum efter inställningen.",
+    "What projects are you working on?": "Vilka projekt jobbar du på?",
+    "We'll create rooms for each topic.": "Vi kommer att skapa rum för varje ämne.",
+    "What are some things you want to discuss?": "Vad är exempel på saker du vill diskutera?",
+    "Inviting...": "Bjuder in…",
+    "Invite by username": "Bjud in med användarnamn",
+    "Invite your teammates": "Bjud in dina teamkamrater",
+    "Failed to invite the following users to your space: %(csvUsers)s": "Misslyckades att bjuda in följande användare till ditt utrymme: %(csvUsers)s",
+    "A private space for you and your teammates": "Ett privat utrymme för dig och dina teamkamrater",
+    "Me and my teammates": "Jag och mina teamkamrater",
+    "A private space just for you": "Ett personligt utrymme för bara dig",
+    "Just Me": "Bara jag",
+    "Ensure the right people have access to the space.": "Försäkra att rätt personer har tillgång till utrymmet.",
+    "Who are you working with?": "Vem arbetar du med?",
+    "Finish": "Färdigställ",
+    "At the moment only you can see it.": "För tillfället så kan bara du se det.",
+    "Creating rooms...": "Skapar rum…",
+    "Skip for now": "Hoppa över för tillfället",
+    "Failed to create initial space rooms": "Misslyckades att skapa initiala utrymmesrum",
+    "Room name": "Rumsnamn",
+    "Support": "Hjälp",
+    "Random": "Slumpmässig",
+    "Welcome to <name/>": "Välkommen till <name/>",
+    "Your private space <name/>": "Ditt privata utrymme <name/>",
+    "Your public space <name/>": "Ditt offentliga utrymme <name/>",
+    "You have been invited to <name/>": "Du har blivit inbjuden till <name/>",
+    "<inviter/> invited you to <name/>": "<inviter/> bjöd in dig till <name/>",
+    "%(count)s members|one": "%(count)s medlem",
+    "%(count)s members|other": "%(count)s medlemmar",
+    "Your server does not support showing space hierarchies.": "Din server stöder inte att visa utrymmeshierarkier.",
+    "Default Rooms": "Förvalda rum",
+    "Add existing rooms & spaces": "Lägg till existerande rum och utrymmen",
+    "Accept Invite": "Acceptera inbjudan",
+    "Find a room...": "Hitta ett rum…",
+    "Manage rooms": "Hantera rum",
+    "Promoted to users": "Befordrad till användare",
+    "Save changes": "Spara ändringar",
+    "You're in this room": "Du är i det här rummet",
+    "You're in this space": "Du är i det här utrymmet",
+    "No permissions": "Inga behörigheter",
+    "Remove from Space": "Ta bort från utrymmet",
+    "Undo": "Ångra",
+    "Your message wasn't sent because this homeserver has been blocked by it's administrator. Please <a>contact your service administrator</a> to continue using the service.": "Ditt meddelande skickades inte eftersom att hemservern har blockerats av sin administratör. Vänligen <a>kontakta din tjänsteadministratör</a> för att fortsätta använda tjänsten.",
+    "Are you sure you want to leave the space '%(spaceName)s'?": "Är du säker på att du vill lämna utrymmet '%(spaceName)s'?",
+    "This space is not public. You will not be able to rejoin without an invite.": "Det här utrymmet är inte offentligt. Du kommer inte kunna gå med igen utan en inbjudan.",
+    "Start audio stream": "Starta ljudström",
+    "Failed to start livestream": "Misslyckades att starta livestream",
+    "Unable to start audio streaming.": "Kunde inte starta ljudströmning.",
+    "Save Changes": "Spara inställningar",
+    "Saving...": "Sparar…",
+    "View dev tools": "Visa utvecklingsverktyg",
+    "Leave Space": "Lämna utrymmet",
+    "Make this space private": "Gör det här utrymmet privat",
+    "Edit settings relating to your space.": "Redigera inställningar relaterat till ditt utrymme.",
+    "Space settings": "Utrymmesinställningar",
+    "Failed to save space settings.": "Misslyckades att spara utrymmesinställningar.",
+    "Invite someone using their name, username (like <userId/>) or <a>share this space</a>.": "Bjud in någon med deras namn eller användarnamn (som <userId/>), eller <a>dela det här utrymmet</a>.",
+    "Invite someone using their name, email address, username (like <userId/>) or <a>share this space</a>.": "Bjud in någon med deras namn, e-postadress eller användarnamn (som <userId/>), eller <a>dela det här rummet</a>.",
+    "Unnamed Space": "Namnlöst utrymme",
+    "Invite to %(spaceName)s": "Bjud in till %(spaceName)s",
+    "Failed to add rooms to space": "Misslyckades att lägga till rum till utrymmet",
+    "Apply": "Verkställ",
+    "Applying...": "Verkställer…",
+    "Create a new room": "Skapa ett nytt rum",
+    "Don't want to add an existing room?": "Vill du inte lägga till ett existerande rum?",
+    "Spaces": "Utrymmen",
+    "Filter your rooms and spaces": "Filtrera dina rum och utrymmen",
+    "Add existing spaces/rooms": "Lägg till existerande utrymmen/rum",
+    "Space selection": "Utrymmesval",
+    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the space it will be impossible to regain privileges.": "Du kommer inte kunna ångra den här ändringen eftersom du degraderar dig själv, och om du är den sista privilegierade användaren i utrymmet så kommer det att vara omöjligt att återfå utrymmet.",
+    "Empty room": "Tomt rum",
+    "Suggested Rooms": "Föreslagna rum",
+    "Explore space rooms": "Utforska rum i utrymmet",
+    "You do not have permissions to add rooms to this space": "Du är inte behörig att lägga till rum till det här utrymmet",
+    "Add existing room": "Lägg till existerande rum",
+    "You do not have permissions to create new rooms in this space": "Du är inte behörig att skapa nya rum i det här utrymmet",
+    "Send message": "Skicka meddelande",
+    "Invite to this space": "Bjud in till det här utrymmet",
+    "Your message was sent": "Ditt meddelande skickades",
+    "Encrypting your message...": "Krypterar ditt meddelande…",
+    "Sending your message...": "Skickar dina meddelanden…",
+    "Spell check dictionaries": "Rättstavningsordböcker",
+    "Space options": "Utrymmesalternativ",
+    "Space Home": "Utrymmeshem",
+    "New room": "Nytt rum",
+    "Leave space": "Lämna utrymmet",
+    "Invite people": "Bjud in folk",
+    "Share your public space": "Dela ditt offentliga utrymme",
+    "Invite members": "Bjud in medlemmar",
+    "Invite by email or username": "Bjud in med e-post eller användarnamn",
+    "Share invite link": "Skapa inbjudningslänk",
+    "Click to copy": "Klicka för att kopiera",
+    "Collapse space panel": "Kollapsa utrymmespanelen",
+    "Expand space panel": "Expandera utrymmespanelen",
+    "Creating...": "Skapar…",
+    "You can change these at any point.": "Du kan ändra dessa när som helst.",
+    "Give it a photo, name and description to help you identify it.": "Ge den en bild, ett namn och en beskrivning för att hjälpa dig att identifiera den.",
+    "Your private space": "Ditt privata utrymme",
+    "Your public space": "Ditt offentliga utrymme",
+    "You can change this later": "Du kan ändra detta senare",
+    "Invite only, best for yourself or teams": "Endast inbjudan, bäst för dig själv eller team",
+    "Private": "Privat",
+    "Open space for anyone, best for communities": "Öppna utrymmet för alla, bäst för gemenskaper",
+    "Public": "Offentligt",
+    "Spaces are new ways to group rooms and people. To join an existing space you’ll need an invite": "Utrymmen är nya sätt att gruppera rum och personer. För att gå med i ett existerande utrymme så behöver du en inbjudan",
+    "Create a space": "Skapa ett utrymme",
+    "Delete": "Radera",
+    "Jump to the bottom of the timeline when you send a message": "Hoppa till botten av tidslinjen när du skickar ett meddelande",
+    "Spaces prototype. Incompatible with Communities, Communities v2 and Custom Tags. Requires compatible homeserver for some features.": "Prototyp för utrymmen. Inkompatibel med gemenskaper, gemenskaper v2 och anpassade taggar. Kräver en kompatibel hemserver för viss funktionalitet.",
+    "This homeserver has been blocked by it's administrator.": "Den här hemservern har blockerats av sin administratör.",
+    "This homeserver has been blocked by its administrator.": "Hemservern har blockerats av sin administratör.",
+    "You're already in a call with this person.": "Du är redan i ett samtal med den här personen.",
+    "Already in call": "Redan i samtal"
 }

From 02a2bd55f99b2c242e8028a0090760a2e4959a5a Mon Sep 17 00:00:00 2001
From: TyIL TTY7 <CF84AE95D763@outlook.com>
Date: Wed, 17 Mar 2021 02:11:21 +0000
Subject: [PATCH 337/420] Translated using Weblate (Chinese (Simplified))

Currently translated at 80.0% (2312 of 2889 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hans/
---
 src/i18n/strings/zh_Hans.json | 75 ++++++++++++++++++++++++++++++++++-
 1 file changed, 74 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index 12fb5e2877..a22e600865 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -2482,5 +2482,78 @@
     "Too Many Calls": "太多呼叫",
     "Call failed because webcam or microphone could not be accessed. Check that:": "通话失败，因为无法访问网络摄像头或麦克风。请检查：",
     "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "呼叫失败，因为无法访问任何麦克风。 检查是否已插入麦克风并正确设置。",
-    "Answered Elsewhere": "在其他地方已回答"
+    "Answered Elsewhere": "在其他地方已回答",
+    "Use the + to make a new room or explore existing ones below": "使用 + 创建新的聊天室或通过下面列出的方式探索已有聊天室",
+    "Start a new chat": "开始新会话",
+    "Room settings": "聊天室设置",
+    "%(count)s people|one": "%(count)s 位成员",
+    "Show files": "显示已发送的文件",
+    "About homeservers": "关于 homeservers",
+    "About": "关于",
+    "Invite members": "邀请成员",
+    "Invite by email or username": "通过电子邮件或用户名邀请",
+    "Share invite link": "分享邀请链接",
+    "Click to copy": "点击复制",
+    "Creating...": "创建中……",
+    "You can change these at any point.": "您可随时更改这些。",
+    "Give it a photo, name and description to help you identify it.": "为它添加一张照片、姓名与描述来帮助您辨认它。",
+    "Your private space": "您的私有空间",
+    "Your public space": "您的公共空间",
+    "You can change this later": "您可稍后更改此项",
+    "Invite only, best for yourself or teams": "仅邀请，适合您自己或团队",
+    "Private": "私有",
+    "Public": "公共",
+    "Delete": "删除",
+    "Dial pad": "拨号盘",
+    "There was an error looking up the phone number": "查询电话号码的过程中发生错误",
+    "Unable to look up phone number": "无法查询电话号码",
+    "Return to call": "返回通话",
+    "Voice Call": "语音通话",
+    "Video Call": "视频通话",
+    "%(peerName)s held the call": "%(peerName)s 挂起了通话",
+    "You held the call <a>Resume</a>": "您挂起了通话 <a>恢复</a>",
+    "You held the call <a>Switch</a>": "您挂起了通话 <a>切换</a>",
+    "Takes the call in the current room off hold": "解除挂起当前聊天室的通话",
+    "Places the call in the current room on hold": "挂起当前聊天室的通话",
+    "Show chat effects (animations when receiving e.g. confetti)": "显示聊天特效（如收到五彩纸屑时的动画效果）",
+    "Use Ctrl + Enter to send a message": "使用 Ctrl + Enter 发送信息",
+    "Use Command + Enter to send a message": "使用 Command + Enter 发送消息",
+    "Use Ctrl + F to search": "使用 Ctrl + F 搜索",
+    "Use Command + F to search": "使用 Command + F 搜索",
+    "Jump to the bottom of the timeline when you send a message": "发送信息时跳转到时间线底部",
+    "Show line numbers in code blocks": "在代码块中显示行号",
+    "Expand code blocks by default": "默认展开代码块",
+    "Show stickers button": "显示贴纸按钮",
+    "Render LaTeX maths in messages": "在信息中渲染 LaTeX 数学",
+    "%(senderName)s ended the call": "%(senderName)s 结束了通话",
+    "You ended the call": "您结束了通话",
+    "This homeserver has been blocked by it's administrator.": "此 homeserver 已被其管理员屏蔽。",
+    "Use app": "使用 app",
+    "Element Web is experimental on mobile. For a better experience and the latest features, use our free native app.": "Element 网页版在移动设备上仍处于试验阶段。使用免费的原生 app 以获得更好的体验与最新的功能。",
+    "Use app for a better experience": "使用 app 以获得更好的体验",
+    "Enable desktop notifications": "开启桌面通知",
+    "Don't miss a reply": "不要错过任何回复",
+    "This homeserver has been blocked by its administrator.": "此 homeserver 已被其管理员屏蔽。",
+    "Send stickers to this room as you": "以您的身份发送贴纸到此聊天室",
+    "Change the avatar of your active room": "更改活跃聊天室的头像",
+    "Change the avatar of this room": "更改当前聊天室的头像",
+    "Change the name of your active room": "更改活跃聊天室的名称",
+    "Change the name of this room": "更改当前聊天室的名称",
+    "Change the topic of your active room": "更改当前活跃聊天室的讨论主题",
+    "Change the topic of this room": "更改当前聊天室的讨论主题",
+    "Change which room, message, or user you're viewing": "更改当前正在查看哪个聊天室、消息或用户",
+    "Change which room you're viewing": "更改当前正在查看哪个聊天室",
+    "Send stickers into your active room": "发送贴纸到您的活跃聊天室",
+    "Send stickers into this room": "发送贴纸到此聊天室",
+    "Remain on your screen while running": "运行时始终保留在您的屏幕上",
+    "Remain on your screen when viewing another room, when running": "运行时始终保留在您的屏幕上，即使您在浏览其它聊天室",
+    "%(senderName)s declined the call.": "%(senderName)s 拒绝了通话。",
+    "(an error occurred)": "（发生了一个错误）",
+    "(their device couldn't start the camera / microphone)": "（对方的设备无法开启摄像头/麦克风）",
+    "Converts the room to a DM": "将此聊天室会话转化为私聊会话",
+    "Converts the DM to a room": "将此私聊会话转化为聊天室会话",
+    "Prepends ┬──┬ ノ( ゜-゜ノ) to a plain-text message": "在纯文字信息前添加 ┬──┬ ノ( ゜-゜ノ)",
+    "Prepends (╯°□°）╯︵ ┻━┻ to a plain-text message": "在纯文字信息前添加 (╯°□°）╯︵ ┻━┻",
+    "You're already in a call with this person.": "您与此人已处在通话中。",
+    "Already in call": "已在通话中"
 }

From 6e73b56c4bbd696df1e5f29808316d6c87a3bc54 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Wed, 17 Mar 2021 13:30:03 +0000
Subject: [PATCH 338/420] Translated using Weblate (Italian)

Currently translated at 100.0% (2889 of 2889 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/it/
---
 src/i18n/strings/it.json | 117 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 116 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 3e5ad9296b..62989bd16e 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -3087,5 +3087,120 @@
     "Setting ID": "ID impostazione",
     "Failed to save settings": "Impossibile salvare le impostazioni",
     "Settings Explorer": "Esploratore di impostazioni",
-    "Show chat effects (animations when receiving e.g. confetti)": "Mostra effetti chat (animazioni quando si ricevono ad es. coriandoli)"
+    "Show chat effects (animations when receiving e.g. confetti)": "Mostra effetti chat (animazioni quando si ricevono ad es. coriandoli)",
+    "Original event source": "Fonte dell'evento originale",
+    "Decrypted event source": "Fonte dell'evento decifrato",
+    "We'll create rooms for each of them. You can add existing rooms after setup.": "Creeremo stanze per ognuno di essi. Puoi aggiungere stanze esistenti dopo la configurazione.",
+    "What projects are you working on?": "Su quali progetti stai lavorando?",
+    "We'll create rooms for each topic.": "Creeremo stanze per ogni argomento.",
+    "What are some things you want to discuss?": "Di cosa vuoi discutere?",
+    "Inviting...": "Invito...",
+    "Invite by username": "Invita per nome utente",
+    "Invite your teammates": "Invita la tua squadra",
+    "Failed to invite the following users to your space: %(csvUsers)s": "Impossibile invitare i seguenti utenti nello spazio: %(csvUsers)s",
+    "A private space for you and your teammates": "Uno spazio privato per te e i tuoi compagni",
+    "Me and my teammates": "Io e la mia squadra",
+    "A private space just for you": "Uno spazio privato solo per te",
+    "Just Me": "Solo io",
+    "Ensure the right people have access to the space.": "Assicurati che le persone giuste abbiano accesso allo spazio.",
+    "Who are you working with?": "Con chi stai lavorando?",
+    "Finish": "Fine",
+    "At the moment only you can see it.": "Al momento solo tu puoi vederlo.",
+    "Creating rooms...": "Creazione stanze...",
+    "Skip for now": "Salta per adesso",
+    "Failed to create initial space rooms": "Creazione di stanze iniziali dello spazio fallita",
+    "Room name": "Nome stanza",
+    "Support": "Supporto",
+    "Random": "Casuale",
+    "Welcome to <name/>": "Ti diamo il benvenuto in <name/>",
+    "Your private space <name/>": "Il tuo spazio privato <name/>",
+    "Your public space <name/>": "Il tuo spazio pubblico <name/>",
+    "You have been invited to <name/>": "Sei stato invitato in <name/>",
+    "<inviter/> invited you to <name/>": "<inviter/> ti ha invitato in <name/>",
+    "%(count)s members|one": "%(count)s membro",
+    "%(count)s members|other": "%(count)s membri",
+    "Your server does not support showing space hierarchies.": "Il tuo server non supporta la visualizzazione di gerarchie di spazi.",
+    "Default Rooms": "Stanze predefinite",
+    "Add existing rooms & spaces": "Aggiungi stanze e spazi esistenti",
+    "Accept Invite": "Accetta invito",
+    "Find a room...": "Trova una stanza...",
+    "Manage rooms": "Gestisci stanze",
+    "Promoted to users": "Promosso a utenti",
+    "Save changes": "Salva modifiche",
+    "You're in this room": "Sei in questa stanza",
+    "You're in this space": "Sei in questo spazio",
+    "No permissions": "Nessuna autorizzazione",
+    "Remove from Space": "Rimuovi dallo spazio",
+    "Undo": "Annulla",
+    "Your message wasn't sent because this homeserver has been blocked by it's administrator. Please <a>contact your service administrator</a> to continue using the service.": "Il tuo messaggio non è stato inviato perché questo homeserver è stato bloccato dal suo amministratore. <a>Contatta l'amministratore del servizio</a> per continuare ad usarlo.",
+    "Are you sure you want to leave the space '%(spaceName)s'?": "Vuoi veramente uscire dallo spazio '%(spaceName)s'?",
+    "This space is not public. You will not be able to rejoin without an invite.": "Questo spazio non è pubblico. Non potrai rientrare senza un invito.",
+    "Start audio stream": "Avvia stream audio",
+    "Failed to start livestream": "Impossibile avviare lo stream in diretta",
+    "Unable to start audio streaming.": "Impossibile avviare lo streaming audio.",
+    "Save Changes": "Salva modifiche",
+    "Saving...": "Salvataggio...",
+    "View dev tools": "Vedi strumenti da sviluppatore",
+    "Leave Space": "Esci dallo spazio",
+    "Make this space private": "Rendi privato questo spazio",
+    "Edit settings relating to your space.": "Modifica le impostazioni relative al tuo spazio.",
+    "Space settings": "Impostazioni spazio",
+    "Failed to save space settings.": "Impossibile salvare le impostazioni dello spazio.",
+    "Invite someone using their name, username (like <userId/>) or <a>share this space</a>.": "Invita qualcuno usando il suo nome, nome utente (come <userId/>) o <a>condividi questo spazio</a>.",
+    "Invite someone using their name, email address, username (like <userId/>) or <a>share this space</a>.": "Invita qualcuno usando il suo nome, indirizzo email, nome utente (come <userId/>) o <a>condividi questo spazio</a>.",
+    "Unnamed Space": "Spazio senza nome",
+    "Invite to %(spaceName)s": "Invita in %(spaceName)s",
+    "Failed to add rooms to space": "Aggiunta di stanze allo spazio fallita",
+    "Apply": "Applica",
+    "Applying...": "Applicazione...",
+    "Create a new room": "Crea nuova stanza",
+    "Don't want to add an existing room?": "Non vuoi aggiungere una stanza esistente?",
+    "Spaces": "Spazi",
+    "Filter your rooms and spaces": "Filtra le tue stanze e spazi",
+    "Add existing spaces/rooms": "Aggiungi spazi/stanze esistenti",
+    "Space selection": "Selezione spazio",
+    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the space it will be impossible to regain privileges.": "Non potrai annullare questa modifica dato che ti stai declassando, se sei l'ultimo utente privilegiato nello spazio sarà impossibile riottenere il grado.",
+    "Empty room": "Stanza vuota",
+    "Suggested Rooms": "Stanze suggerite",
+    "Explore space rooms": "Esplora stanze dello spazio",
+    "You do not have permissions to add rooms to this space": "Non hai i permessi per aggiungere stanze a questo spazio",
+    "Add existing room": "Aggiungi stanza esistente",
+    "You do not have permissions to create new rooms in this space": "Non hai i permessi per creare stanze in questo spazio",
+    "Send message": "Invia messaggio",
+    "Invite to this space": "Invita in questo spazio",
+    "Your message was sent": "Il tuo messaggio è stato inviato",
+    "Encrypting your message...": "Crittazione del tuo messaggio...",
+    "Sending your message...": "Invio del tuo messaggio...",
+    "Spell check dictionaries": "Dizionari di controllo ortografia",
+    "Space options": "Opzioni dello spazio",
+    "Space Home": "Pagina iniziale dello spazio",
+    "New room": "Nuova stanza",
+    "Leave space": "Esci dallo spazio",
+    "Invite people": "Invita persone",
+    "Share your public space": "Condividi il tuo spazio pubblico",
+    "Invite members": "Invita membri",
+    "Invite by email or username": "Invita per email o nome utente",
+    "Share invite link": "Condividi collegamento di invito",
+    "Click to copy": "Clicca per copiare",
+    "Collapse space panel": "Riduci pannello dello spazio",
+    "Expand space panel": "Espandi pannello dello spazio",
+    "Creating...": "Creazione...",
+    "You can change these at any point.": "Puoi cambiarli in qualsiasi momento.",
+    "Give it a photo, name and description to help you identify it.": "Dagli una foto, un nome e una descrizione per aiutarti a identificarlo.",
+    "Your private space": "Il tuo spazio privato",
+    "Your public space": "Il tuo spazio pubblico",
+    "You can change this later": "Puoi modificarlo in seguito",
+    "Invite only, best for yourself or teams": "Solo su invito, la scelta migliore per te o i team",
+    "Private": "Privato",
+    "Open space for anyone, best for communities": "Spazio aperto a tutti, la scelta migliore per le comunità",
+    "Public": "Pubblico",
+    "Spaces prototype. Incompatible with Communities, Communities v2 and Custom Tags. Requires compatible homeserver for some features.": "Prototipo degli spazi. Non compatibile con comunità, comunità v2 ed etichette personalizzate. Richiede un homeserver compatibile per alcune funzioni.",
+    "Spaces are new ways to group rooms and people. To join an existing space you’ll need an invite": "Gli spazi sono nuovi modi di raggruppare stanze e persone. Per entrare in uno spazio esistente ti serve un invito",
+    "Create a space": "Crea uno spazio",
+    "Delete": "Elimina",
+    "Jump to the bottom of the timeline when you send a message": "Salta in fondo alla linea temporale quando invii un messaggio",
+    "This homeserver has been blocked by it's administrator.": "Questo homeserver è stato bloccato dal suo amministratore.",
+    "This homeserver has been blocked by its administrator.": "Questo homeserver è stato bloccato dal suo amministratore.",
+    "You're already in a call with this person.": "Sei già in una chiamata con questa persona.",
+    "Already in call": "Già in una chiamata"
 }

From 56d3a9ac61560dd8f51ebcd67256eb4ebe0ed1c3 Mon Sep 17 00:00:00 2001
From: tateisu <tateisu@gmail.com>
Date: Fri, 12 Mar 2021 12:23:34 +0000
Subject: [PATCH 339/420] Translated using Weblate (Japanese)

Currently translated at 79.6% (2301 of 2889 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ja/
---
 src/i18n/strings/ja.json | 112 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 110 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index 0035bdd5df..09329fb359 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -1484,7 +1484,7 @@
     "e.g. my-room": "例: my-room",
     "Room address": "ルームアドレス",
     "New published address (e.g. #alias:server)": "新しい公開アドレス (例: #alias:server)",
-    "No other published addresses yet, add one below": "現在、公開アドレスがありません。以下から追加可能です",
+    "No other published addresses yet, add one below": "他の公開アドレスはまだありません。以下から追加できます",
     "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "検索結果を表示させるために、暗号化されたメッセージをローカルに安全にキャッシュしています。現在、%(rooms)s 件の部屋のメッセージの保存に %(size)s を使用中です。",
     "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "検索結果を表示させるために、暗号化されたメッセージをローカルに安全にキャッシュしています。現在、%(rooms)s 件の部屋のメッセージの保存に %(size)s を使用中です。",
     "Mentions & Keywords": "メンションとキーワード",
@@ -2336,5 +2336,113 @@
     "Click the button below to confirm adding this phone number.": "下のボタンをクリックして電話番号の追加を確認します。",
     "Confirm adding phone number": "電話番号の追加を確認する",
     "Confirm adding this phone number by using Single Sign On to prove your identity.": "シングルサインオンを使用して本人確認を行い、電話番号の追加を承認してください。",
-    "Click the button below to confirm adding this email address.": "下のボタンを押してこのメールアドレスを確認します。"
+    "Click the button below to confirm adding this email address.": "下のボタンを押してこのメールアドレスを確認します。",
+    "Reactions": "リアクション",
+    "Declining …": "断り中です…",
+    "Accepting …": "受け付け中です…",
+    "%(name)s accepted": "%(name)s は受け付けました",
+    "You accepted": "あなたは受け付けました",
+    "Waiting for you to accept on your other session…": "あなたがサインイン中の他のセッションで受け付けられるのを待ちます…",
+    "%(name)s cancelled": "%(name)s は中止しました",
+    "%(name)s declined": "%(name)sは断りました",
+    "You cancelled": "あなたは中止しました",
+    "You declined": "あなたは断りました",
+    "%(name)s cancelled verifying": "%(name)s は検証を中止しました",
+    "You cancelled verifying %(name)s": "%(name)s の検証を中止しました",
+    "You verified %(name)s": "%(name)s を検証しました",
+    "You have ignored this user, so their message is hidden. <a>Show anyways.</a>": "このユーザを無視しているのでメッセージは隠されます。<a>とにかく表示する</a>",
+    "Video conference started by %(senderName)s": "ビデオ会議は %(senderName)s により開始されました",
+    "Video conference ended by %(senderName)s": "ビデオ会議は %(senderName)s により終了しました",
+    "Video conference updated by %(senderName)s": "ビデオ会議は %(senderName)s により更新されました",
+    "Join the conference from the room information card on the right": "右側の部屋情報カードから会議に参加する",
+    "Join the conference at the top of this room": "この部屋の上部で会議に参加する",
+    "Message Actions": "メッセージのアクション",
+    "Ignored attempt to disable encryption": "暗号化を無効にする試みを無視しました",
+    "Compare emoji": "絵文字を比較",
+    "You cancelled verification on your other session.": "他のセッションで検証を中止しました。",
+    "Verification timed out.": "検証がタイムアウトしました。",
+    "Start verification again from the notification.": "通知から再度検証を開始します。",
+    "Verified": "検証済",
+    "In encrypted rooms, verify all users to ensure it’s secure.": "暗号化された部屋では、安全確認のために全てのユーザーを検証します。",
+    "Almost there! Is %(displayName)s showing the same shield?": "あと少しです！ %(displayName)s は同じ盾マークを表示していますか？",
+    "Almost there! Is your other session showing the same shield?": "あと少しです！ あなたの他のセッションは同じ盾マークを表示していますか？",
+    "Verify by emoji": "絵文字で検証",
+    "Verify by comparing unique emoji.": "絵文字の並びを比較して検証。",
+    "If you can't scan the code above, verify by comparing unique emoji.": "上記のコードをスキャンできない場合は、絵文字による確認を行ってください。",
+    "Ask %(displayName)s to scan your code:": "%(displayName)s にQRコードをスキャンするよう問い合わせてください:",
+    "Verify by scanning": "QRコードスキャンで検証",
+    "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what %(brand)s supports. Try with a different client.": "検証しようとしているセッションは %(brand)s で利用できる QRコードのスキャンまたは絵文字認証をサポートしていません。 別のクライアントで試してください。",
+    "This client does not support end-to-end encryption.": "このクライアントはエンドツーエンド暗号化に対応していません。",
+    "Failed to deactivate user": "ユーザーの非アクティブ化に失敗しました",
+    "Deactivate user": "ユーザーを非アクティブ化する",
+    "Deactivating this user will log them out and prevent them from logging back in. Additionally, they will leave all the rooms they are in. This action cannot be reversed. Are you sure you want to deactivate this user?": "このユーザーを非アクティブ化するとユーザーはログアウトされて再度ログインできなくなります。さらにユーザーは現在参加中の部屋すべてから離れます。このアクションを元に戻すことはできません。 このユーザーを非アクティブ化してもよろしいですか?",
+    "Deactivate user?": "ユーザーを非アクティブ化しますか?",
+    "Remove %(count)s messages|one": "1件のメッセージを削除する",
+    "Remove %(count)s messages|other": "%(count)s 件のメッセージを削除する",
+    "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "大量のメッセージだと時間がかかるかもしれません。その間はクライアントをリロードしないでください。",
+    "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|one": "%(user)s からのメッセージ 1 件を削除しようとしています。 これは元に戻せません。続けますか?",
+    "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|other": "%(user)s からの %(count)s 件のメッセージを削除しようとしています。これは元に戻せません。続けますか?",
+    "Remove recent messages by %(user)s": "%(user)s からの最近のメッセージを削除する",
+    "Try scrolling up in the timeline to see if there are any earlier ones.": "タイムラインを上にスクロールして、以前のものがあるかどうかを確認してください。",
+    "No recent messages by %(user)s found": "%(user)s からの最近のメッセージが見つかりません",
+    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the space it will be impossible to regain privileges.": "自分自身を降格しているため、この変更を元に戻すことはできません。スペース内の最後の特権ユーザーである場合、特権を取り戻すことはできません。",
+    "Not encrypted": "暗号化されていません",
+    "Edit widgets, bridges & bots": "ウィジェット、ブリッジ、ボットを編集する",
+    "Set my room layout for everyone": "私の部屋のレイアウトをみんな用に設定します",
+    "Unpin a widget to view it in this panel": "ウィジェットのピン留めを外して、このパネルに表示します",
+    "Unpin": "ピン留めを外す",
+    "You can only pin up to %(count)s widgets|other": "ウィジェットのピン留めは %(count)s 件までです",
+    "Yours, or the other users’ session": "あなたまたは他のユーザーのセッション",
+    "Yours, or the other users’ internet connection": "あなたまたは他のユーザーのインターネット接続",
+    "The homeserver the user you’re verifying is connected to": "あなたが検証しているユーザーが接続するホームサーバー",
+    "One of the following may be compromised:": "次のいずれかが危険にさらされる可能性があります:",
+    "Your messages are not secure": "あなたのメッセージは暗号化されません",
+    "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "暗号化された部屋ではメッセージは保護されます。メッセージをアンロックするためのキーはあなたと受信者だけが持っています。",
+    "Other published addresses:": "他の公開アドレス:",
+    "Error removing address": "アドレスの削除のエラー",
+    "There was an error removing that address. It may no longer exist or a temporary error occurred.": "アドレスの削除中にエラーがありました。既に存在しない部屋か、一時的なエラーが発生したか。",
+    "You don't have permission to delete the address.": "アドレスを削除する権限がありません。",
+    "Empty room": "空の部屋",
+    "Suggested Rooms": "おすすめの部屋",
+    "Explore space rooms": "スペース内の部屋を探索します",
+    "You do not have permissions to add rooms to this space": "このスペースに部屋を追加する権限がありません",
+    "Add existing room": "既存の部屋を追加します",
+    "You do not have permissions to create new rooms in this space": "このスペースに新しい部屋を作成する権限がありません",
+    "Send message": "メッセージを送ります",
+    "Invite to this space": "このスペースに招待します",
+    "Your message was sent": "メッセージは送信されました",
+    "Encrypting your message...": "メッセージの暗号化中…",
+    "Sending your message...": "メッセージの送信中…",
+    "Spell check dictionaries": "スペルチェック辞書",
+    "Space options": "スペースのオプション",
+    "Space Home": "スペースのホーム",
+    "New room": "新しい部屋",
+    "Leave space": "スペースを離れる",
+    "Invite people": "人々を招待する",
+    "Share your public space": "公開スペースを共有する",
+    "Invite members": "参加者を招待する",
+    "Invite by email or username": "メールまたはユーザー名で招待する",
+    "Share invite link": "招待リンクを共有する",
+    "Click to copy": "クリックでコピーします",
+    "Collapse space panel": "スペースパネルを畳む",
+    "Expand space panel": "スペースパネルを展開",
+    "Creating...": "作成中…",
+    "You can change these at any point.": "これらはいつでも変更できます。",
+    "Give it a photo, name and description to help you identify it.": "写真、名前、説明を追加して識別しやすくします。",
+    "Your private space": "あなたの非公開スペース",
+    "Your public space": "あなたの公開スペース",
+    "You can change this later": "これは後から変更できます",
+    "Invite only, best for yourself or teams": "招待のみ。チームや個人での使用に適しています",
+    "Private": "非公開",
+    "Open space for anyone, best for communities": "誰もが利用できるオープンスペース、コミュニティに最適",
+    "Public": "公開",
+    "Spaces are new ways to group rooms and people. To join an existing space you’ll need an invite": "スペースは部屋や人をグループ化する新しい方法です。 既存のスペースに参加するには招待状が必要です",
+    "Create a space": "スペースを作成する",
+    "Delete": "削除",
+    "Jump to the bottom of the timeline when you send a message": "メッセージを送信する際にタイムライン最下部に移動します",
+    "Spaces prototype. Incompatible with Communities, Communities v2 and Custom Tags. Requires compatible homeserver for some features.": "Spacesはプロトタイプです。 コミュニティ、コミュニティv2、カスタムタグとは互換性がありません。 一部の機能には互換性のあるホームサーバーが必要です。",
+    "This homeserver has been blocked by it's administrator.": "このホームサーバーは管理者によりブロックされています。",
+    "This homeserver has been blocked by its administrator.": "このホームサーバーは管理者によりブロックされています。",
+    "You're already in a call with this person.": "あなたは既にこの人と通話中です。",
+    "Already in call": "既に電話中です"
 }

From 11da2d5ca5562c7ed985ff919eb46dd3c91cf021 Mon Sep 17 00:00:00 2001
From: waclaw66 <waclaw66@seznam.cz>
Date: Wed, 17 Mar 2021 17:08:50 +0000
Subject: [PATCH 340/420] Translated using Weblate (Czech)

Currently translated at 100.0% (2889 of 2889 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
---
 src/i18n/strings/cs.json | 127 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 121 insertions(+), 6 deletions(-)

diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index db01caed97..90941ced30 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -228,7 +228,7 @@
     "Who can access this room?": "Kdo má přístup do této místnosti?",
     "Who can read history?": "Kdo může číst historii?",
     "You are not in this room.": "Nejste v této místnosti.",
-    "You do not have permission to do that in this room.": "V této místnosti nemáte na toto právo.",
+    "You do not have permission to do that in this room.": "V této místnosti k tomu nemáte oprávnění.",
     "You cannot place a call with yourself.": "Nemůžete volat sami sobě.",
     "You cannot place VoIP calls in this browser.": "V tomto prohlížeči nelze vytáčet VoIP hovory.",
     "You do not have permission to post to this room": "Nemáte oprávnění zveřejňovat příspěvky v této místnosti",
@@ -749,7 +749,7 @@
     "A call is currently being placed!": "Právě probíhá jiný hovor!",
     "A call is already in progress!": "Jeden hovor už probíhá!",
     "Permission Required": "Vyžaduje oprávnění",
-    "You do not have permission to start a conference call in this room": "Nemáte oprávnění v této místnosti začít konferenční hovor",
+    "You do not have permission to start a conference call in this room": "V této místnosti nemáte oprávnění zahájit konferenční hovor",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s",
     "Missing roomId.": "Chybějící ID místnosti.",
     "Opens the Developer Tools dialog": "Otevře dialog nástrojů pro vývojáře",
@@ -818,7 +818,7 @@
     "Share Room Message": "Sdílet zprávu z místnosti",
     "Link to selected message": "Odkaz na vybranou zprávu",
     "COPY": "Kopírovat",
-    "Share Message": "Sdílet",
+    "Share Message": "Sdílet zprávu",
     "Collapse Reply Thread": "Sbalit vlákno odpovědi",
     "Unable to join community": "Není možné vstoupit do skupiny",
     "Unable to leave community": "Není možné opustit skupinu",
@@ -1941,7 +1941,7 @@
     "Indexed rooms:": "Indexované místnosti:",
     "Message downloading sleep time(ms)": "Čas na stažení zprávy (ms)",
     "Sign In or Create Account": "Přihlásit nebo vytvořit nový účet",
-    "Use your account or create a new one to continue.": "Pro pokračování se přihlaste existujícím účtem, nebo si vytvořte nový.",
+    "Use your account or create a new one to continue.": "Pro pokračování se přihlaste stávajícím účtem, nebo si vytvořte nový.",
     "Create Account": "Vytvořit účet",
     "Order rooms by name": "Seřadit místnosti podle názvu",
     "Show rooms with unread notifications first": "Zobrazovat místnosti s nepřečtenými oznámeními navrchu",
@@ -2982,7 +2982,7 @@
     "Abort": "Přerušit",
     "Are you sure you wish to abort creation of the host? The process cannot be continued.": "Opravdu chcete přerušit vytváření hostitele? Proces nemůže být navázán.",
     "Confirm abort of host creation": "Potvrďte přerušení vytváření hostitele",
-    "Upgrade to %(hostSignupBrand)s": "Aktualizovat na %(hostSignupBrand)s",
+    "Upgrade to %(hostSignupBrand)s": "Povýšit na %(hostSignupBrand)s",
     "Edit Values": "Upravit hodnoty",
     "Values at explicit levels in this room:": "Hodnoty na explicitních úrovních v této místnosti:",
     "Values at explicit levels:": "Hodnoty na explicitních úrovních:",
@@ -3003,5 +3003,120 @@
     "Setting ID": "ID nastavení",
     "Failed to save settings": "Nastavení se nepodařilo uložit",
     "Settings Explorer": "Průzkumník nastavení",
-    "Show chat effects (animations when receiving e.g. confetti)": "Zobrazit efekty chatu (animace např. při přijetí konfet)"
+    "Show chat effects (animations when receiving e.g. confetti)": "Zobrazit efekty chatu (animace např. při přijetí konfet)",
+    "Spaces are new ways to group rooms and people. To join an existing space you’ll need an invite": "Spaces jsou nový způsob, jak seskupovat místnosti a lidi. Chcete-li se připojit k existujícímu space, budete potřebovat pozvánku",
+    "We'll create rooms for each of them. You can add existing rooms after setup.": "Pro každý z nich vytvoříme místnost. Po nastavení můžete přidat stávající místnosti.",
+    "What projects are you working on?": "Na jakých projektech pracujete?",
+    "We'll create rooms for each topic.": "Pro každé téma vytvoříme místnosti.",
+    "What are some things you want to discuss?": "O kterých věcech chcete diskutovat?",
+    "Inviting...": "Pozvání...",
+    "Invite by username": "Pozvat podle uživatelského jména",
+    "Invite your teammates": "Pozvěte své spolupracovníky",
+    "Failed to invite the following users to your space: %(csvUsers)s": "Nepodařilo se pozvat následující uživatele do vašeho space: %(csvUsers)s",
+    "A private space for you and your teammates": "Soukromý space pro Vás a vaše spolupracovníky",
+    "Me and my teammates": "Já a moji spolupracovníci",
+    "A private space just for you": "Soukromý space právě pro vás",
+    "Just Me": "Pouze já",
+    "Ensure the right people have access to the space.": "Zajistěte, aby do prostoru měli přístup správní lidé.",
+    "Who are you working with?": "S kým pracujete?",
+    "At the moment only you can see it.": "V tuto chvíli to vidíte jen Vy.",
+    "Creating rooms...": "Vytváření místností...",
+    "Skip for now": "Prozatím přeskočit",
+    "Failed to create initial space rooms": "Vytvoření počátečních místností ve space se nezdařilo",
+    "Random": "Náhodný",
+    "Your private space <name/>": "Váš soukromý space <name/>",
+    "Your public space <name/>": "Váš veřejný space <name/>",
+    "You have been invited to <name/>": "Byli jste pozváni do <name/>",
+    "<inviter/> invited you to <name/>": "<inviter/> vás pozval do <name/>",
+    "%(count)s members|one": "%(count)s člen",
+    "%(count)s members|other": "%(count)s členů",
+    "Your server does not support showing space hierarchies.": "Váš server nepodporuje zobrazování hierarchií spaces.",
+    "Default Rooms": "Výchozí místnosti",
+    "Add existing rooms & spaces": "Přidat stávající místnosti a spaces",
+    "Accept Invite": "Přijmout pozvání",
+    "Find a room...": "Najít místnost...",
+    "Manage rooms": "Spravovat místnosti",
+    "Promoted to users": "Propagováno uživatelům",
+    "Save changes": "Uložit změny",
+    "You're in this room": "Jste v této místnosti",
+    "You're in this space": "Jste v tomto space",
+    "No permissions": "Žádná oprávnění",
+    "Remove from Space": "Odebrat ze space",
+    "Undo": "Vrátit",
+    "Your message wasn't sent because this homeserver has been blocked by it's administrator. Please <a>contact your service administrator</a> to continue using the service.": "Vaše zpráva nebyla odeslána, protože tento domovský server byl zablokován jeho správcem. <a>Kontaktujte svého správce služby</a>, abyste mohli službu nadále používat.",
+    "Are you sure you want to leave the space '%(spaceName)s'?": "Opravdu chcete opustit space '%(spaceName)s'?",
+    "This space is not public. You will not be able to rejoin without an invite.": "Tento space není veřejný. Bez pozvánky se nebudete moci znovu připojit.",
+    "Start audio stream": "Zahájit audio přenos",
+    "Failed to start livestream": "Nepodařilo spustit živý přenos",
+    "Unable to start audio streaming.": "Nelze spustit streamování zvuku.",
+    "View dev tools": "Zobrazit nástroje pro vývojáře",
+    "Leave Space": "Opustit space",
+    "Make this space private": "Nastavit tento space jako soukromý",
+    "Edit settings relating to your space.": "Upravte nastavení týkající se vašeho space.",
+    "Space settings": "Nastavení space",
+    "Failed to save space settings.": "Nastavení space se nepodařilo uložit.",
+    "Invite someone using their name, username (like <userId/>) or <a>share this space</a>.": "Pozvěte někoho pomocí jeho jména, uživatelského jména (například <userId/>) nebo <a>sdílejte tento space</a>.",
+    "Invite someone using their name, email address, username (like <userId/>) or <a>share this space</a>.": "Pozvěte někoho pomocí jeho jména, e-mailové adresy, uživatelského jména (například <userId/>) nebo <a>sdílejte tento space</a>.",
+    "Unnamed Space": "Nejmenovaný space",
+    "Invite to %(spaceName)s": "Pozvat do %(spaceName)s",
+    "Failed to add rooms to space": "Nepodařilo se přidat místnosti do space",
+    "Applying...": "Potvrzuji...",
+    "Apply": "Použít",
+    "Create a new room": "Vytvořit novou místnost",
+    "Don't want to add an existing room?": "Nechcete přidat existující místnost?",
+    "Spaces": "Spaces",
+    "Filter your rooms and spaces": "Filtrujte své místnosti a spaces",
+    "Add existing spaces/rooms": "Přidat existující space/místnost",
+    "Space selection": "Výběr space",
+    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the space it will be impossible to regain privileges.": "Tuto změnu nebudete moci vrátit zpět, protože budete degradováni, pokud jste posledním privilegovaným uživatelem v daném space, nebude možné znovu získat oprávnění.",
+    "Empty room": "Prázdná místnost",
+    "Suggested Rooms": "Doporučené místnosti",
+    "Explore space rooms": "Prozkoumat místnosti space",
+    "You do not have permissions to add rooms to this space": "Nemáte oprávnění k přidávání místností do tohoto space",
+    "Add existing room": "Přidat existující místnost",
+    "You do not have permissions to create new rooms in this space": "Nemáte oprávnění k vytváření nových místností v tomto space",
+    "Send message": "Poslat zprávu",
+    "Invite to this space": "Pozvat do tohoto space",
+    "Your message was sent": "Zpráva byla odeslána",
+    "Encrypting your message...": "Šifrování zprávy...",
+    "Sending your message...": "Odesílání zprávy...",
+    "Spell check dictionaries": "Slovníky pro kontrolu pravopisu",
+    "Space options": "Nastavení space",
+    "Space Home": "Domov space",
+    "New room": "Nová místnost",
+    "Leave space": "Opusit space",
+    "Invite people": "Pozvat lidi",
+    "Share your public space": "Sdílejte svůj veřejný space",
+    "Invite members": "Pozvat členy",
+    "Invite by email or username": "Pozvěte e-mailem nebo uživatelským jménem",
+    "Share invite link": "Sdílet odkaz na pozvánku",
+    "Click to copy": "Kliknutím zkopírujte",
+    "Expand space panel": "Rozbalit space panel",
+    "Collapse space panel": "Sbalit space panel",
+    "Creating...": "Vytváření...",
+    "You can change these at any point.": "Můžete je kdykoli změnit.",
+    "Give it a photo, name and description to help you identify it.": "Přiřaďte mu obrázek, jméno a popis, abyste jej mohli lépe identifikovat.",
+    "Your private space": "Váš soukromý space",
+    "Your public space": "Váš veřejný space",
+    "You can change this later": "Toto můžete změnit později",
+    "Invite only, best for yourself or teams": "Pouze pozvat, nejlepší pro sebe nebo pro týmy",
+    "Private": "Soukromý",
+    "Open space for anyone, best for communities": "Otevřený space pro kohokoli, nejlepší pro komunity",
+    "Public": "Veřejný",
+    "Create a space": "Vytvořit space",
+    "Jump to the bottom of the timeline when you send a message": "Při odesílání zprávy přeskočit na konec časové osy",
+    "Spaces prototype. Incompatible with Communities, Communities v2 and Custom Tags. Requires compatible homeserver for some features.": "Spaces prototyp. Nejsou kompatibilní se skupinami, skupinami v2 a vlastními štítky. Pro některé funkce je vyžadován kompatibilní domovský server.",
+    "This homeserver has been blocked by its administrator.": "Tento domovský server byl zablokován jeho správcem.",
+    "You're already in a call with this person.": "S touto osobou již telefonujete.",
+    "Already in call": "Již máte hovor",
+    "Delete": "Smazat",
+    "This homeserver has been blocked by it's administrator.": "Tento domovský server byl zablokován jeho správcem.",
+    "Original event source": "Původní zdroj události",
+    "Decrypted event source": "Dešifrovaný zdroj události",
+    "Saving...": "Ukládám...",
+    "Save Changes": "Uložit změny",
+    "Welcome to <name/>": "Vítejte v <name/>",
+    "Support": "Podpora",
+    "Room name": "Název místnosti",
+    "Finish": "Dokončit"
 }

From 319c472fdd33b14933a26172e118807a27d8f860 Mon Sep 17 00:00:00 2001
From: XoseM <correoxm@disroot.org>
Date: Fri, 12 Mar 2021 05:33:00 +0000
Subject: [PATCH 341/420] Translated using Weblate (Galician)

Currently translated at 100.0% (2889 of 2889 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
---
 src/i18n/strings/gl.json | 117 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 116 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index 98a984d860..f581013250 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -3087,5 +3087,120 @@
     "Setting ID": "ID do axuste",
     "Failed to save settings": "Non se gardaron os axustes",
     "Settings Explorer": "Navegar nos axustes",
-    "Show chat effects (animations when receiving e.g. confetti)": "Mostrar efectos no chat (animacións na recepción, ex. confetti)"
+    "Show chat effects (animations when receiving e.g. confetti)": "Mostrar efectos no chat (animacións na recepción, ex. confetti)",
+    "Original event source": "Fonte orixinal do evento",
+    "Decrypted event source": "Fonte descifrada do evento",
+    "We'll create rooms for each of them. You can add existing rooms after setup.": "Crearemos salas para cada un deles. Podes engadir salas existentes após a configuración.",
+    "What projects are you working on?": "En que proxectos estás a traballar?",
+    "We'll create rooms for each topic.": "Crearemos salas para cada tema.",
+    "What are some things you want to discuss?": "Cales son os temas sobre os que queres debater?",
+    "Inviting...": "Convidando...",
+    "Invite by username": "Convidar por nome de usuaria",
+    "Invite your teammates": "Convida ao teu equipo",
+    "Failed to invite the following users to your space: %(csvUsers)s": "Fallou o convite ao teu espazo para as seguintes usuarias: %(csvUsers)s",
+    "A private space for you and your teammates": "Un espazo privado para ti e o teu equipo",
+    "Me and my teammates": "Eu máis o meu equipo",
+    "A private space just for you": "Un espazo privado só para ti",
+    "Just Me": "Só eu",
+    "Ensure the right people have access to the space.": "Asegúrate de que as persoas correctas teñen acceso ao espazo.",
+    "Who are you working with?": "Con quen estás a traballar?",
+    "Finish": "Rematar",
+    "At the moment only you can see it.": "Por agora só ti podes velo.",
+    "Creating rooms...": "Creando salas...",
+    "Skip for now": "Omitir por agora",
+    "Failed to create initial space rooms": "Fallou a creación inicial das salas do espazo",
+    "Room name": "Nome da sala",
+    "Support": "Axuda",
+    "Random": "Ao chou",
+    "Welcome to <name/>": "Benvida a <name/>",
+    "Your private space <name/>": "O teu espazo privado <name/>",
+    "Your public space <name/>": "O teu espazo público <name/>",
+    "You have been invited to <name/>": "Foches convidada a <name/>",
+    "<inviter/> invited you to <name/>": "<inviter/> convidoute a <name/>",
+    "%(count)s members|one": "%(count)s participante",
+    "%(count)s members|other": "%(count)s participantes",
+    "Your server does not support showing space hierarchies.": "O teu servidor non soporta amosar xerarquías dos espazos.",
+    "Default Rooms": "Salas por defecto",
+    "Add existing rooms & spaces": "Engadir salas e espazos existentes",
+    "Accept Invite": "Aceptar Convite",
+    "Find a room...": "Atopar unha sala...",
+    "Manage rooms": "Xestionar salas",
+    "Promoted to users": "Promovida ás usuarias",
+    "Save changes": "Gardar cambios",
+    "You're in this room": "Estás nesta sala",
+    "You're in this space": "Estas neste espazo",
+    "No permissions": "Sen permiso",
+    "Remove from Space": "Eliminar do Espazo",
+    "Undo": "Desfacer",
+    "Your message wasn't sent because this homeserver has been blocked by it's administrator. Please <a>contact your service administrator</a> to continue using the service.": "A túa mensaxe non se enviou porque o servidor foi bloqueado pola súa administración. Contacta <a>coa administración do servizo</a> para seguir utilizando o servizo.",
+    "Are you sure you want to leave the space '%(spaceName)s'?": "Tes a certeza de querer deixar o espazo '%(spaceName)s'?",
+    "This space is not public. You will not be able to rejoin without an invite.": "Este espazo non é público. Non poderás volver a unirte sen un convite.",
+    "Start audio stream": "Iniciar fluxo de audio",
+    "Failed to start livestream": "Fallou o inicio da emisión en directo",
+    "Unable to start audio streaming.": "Non se puido iniciar a retransmisión de audio.",
+    "Save Changes": "Gardar cambios",
+    "Saving...": "Gardando...",
+    "View dev tools": "Ver ferramentas dev",
+    "Leave Space": "Deixar o Espazo",
+    "Make this space private": "Establecer este espazo como privado",
+    "Edit settings relating to your space.": "Editar os axustes relativos ao teu espazo.",
+    "Space settings": "Axustes do espazo",
+    "Failed to save space settings.": "Fallo ao gardar os axustes do espazo.",
+    "Invite someone using their name, username (like <userId/>) or <a>share this space</a>.": "Convida a alguén usando o seu nome, nome de usuaria (como <userId/>) ou <a>comparte este espazo</a>.",
+    "Invite someone using their name, email address, username (like <userId/>) or <a>share this space</a>.": "Convida a persoas usando o seu nome, enderezo de email, nome de usuaria (como <userId/>) ou <a>comparte este espazo</a>.",
+    "Unnamed Space": "Espazo sen nome",
+    "Invite to %(spaceName)s": "Convidar a %(spaceName)s",
+    "Failed to add rooms to space": "Fallou a adición das salas ao espazo",
+    "Apply": "Aplicar",
+    "Applying...": "Aplicando...",
+    "Create a new room": "Crear unha nova sala",
+    "Don't want to add an existing room?": "Non queres engadir unha sala existente?",
+    "Spaces": "Espazos",
+    "Filter your rooms and spaces": "Filtra as túas salas e espazos",
+    "Space selection": "Selección de Espazos",
+    "Add existing spaces/rooms": "Engadir espazos/salas existentes",
+    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the space it will be impossible to regain privileges.": "Non poderás desfacer este cambio xa que te estás degradando a ti mesma, se es a última usuaria con privilexios no espazo será imposible volver a obter os privilexios.",
+    "Empty room": "Sala baleira",
+    "Suggested Rooms": "Salas suxeridas",
+    "Explore space rooms": "Explorar salas do espazo",
+    "You do not have permissions to add rooms to this space": "Non tes permiso para engadir salas a este espazo",
+    "Add existing room": "Engadir sala existente",
+    "You do not have permissions to create new rooms in this space": "Non tes permiso para crear novas salas neste espazo",
+    "Send message": "Enviar mensaxe",
+    "Invite to this space": "Convidar a este espazo",
+    "Your message was sent": "Enviouse a túa mensaxe",
+    "Encrypting your message...": "Cifrando a túa mensaxe...",
+    "Sending your message...": "Enviando a túa mensaxe...",
+    "Spell check dictionaries": "Dicionarios de ortografía",
+    "Space options": "Opcións do Espazo",
+    "Space Home": "Incio do Espazo",
+    "New room": "Nova sala",
+    "Leave space": "Saír do espazo",
+    "Invite people": "Convidar persoas",
+    "Share your public space": "Comparte o teu espazo público",
+    "Invite members": "Convidar membros",
+    "Invite by email or username": "Convidar por email ou nome de usuaria",
+    "Share invite link": "Compartir ligazón do convite",
+    "Click to copy": "Click para copiar",
+    "Collapse space panel": "Pechar panel do espazo",
+    "Expand space panel": "Despregar panel do espazo",
+    "Creating...": "Creando...",
+    "You can change these at any point.": "Podes cambiar esto en calquera momento.",
+    "Give it a photo, name and description to help you identify it.": "Ponlle unha foto, nome e descrición para axudar a identificalo.",
+    "Your private space": "O teu espazo privado",
+    "Your public space": "O teu espazo público",
+    "You can change this later": "Podes cambiar esto máis tarde",
+    "Invite only, best for yourself or teams": "Só con convite, mellor para ti ou para equipos",
+    "Private": "Privado",
+    "Open space for anyone, best for communities": "Espazo aberto para calquera, mellor para comunidades",
+    "Public": "Público",
+    "Spaces are new ways to group rooms and people. To join an existing space you’ll need an invite": "Espazos son novos xeitos de agrupar salas e persoas. Para unirse a un espazo existente precisarás un convite",
+    "Create a space": "Crear un espazo",
+    "Delete": "Eliminar",
+    "Jump to the bottom of the timeline when you send a message": "Ir ao final da cronoloxía cando envías unha mensaxe",
+    "Spaces prototype. Incompatible with Communities, Communities v2 and Custom Tags. Requires compatible homeserver for some features.": "Prototipo de Espazos. Incompatible con Comunidades, Comunidades v2 e Etiquetas Personais. Require un servidor compatible para algunhas características.",
+    "This homeserver has been blocked by it's administrator.": "Este servidor de inicio foi bloqueado pola súa administración.",
+    "This homeserver has been blocked by its administrator.": "O servidor de inicio foi bloqueado pola súa administración.",
+    "You're already in a call with this person.": "Xa estás nunha conversa con esta persoa.",
+    "Already in call": "Xa estás nunha chamada"
 }

From 0dc62347ed89c02c7965f255f663c8ac725ea982 Mon Sep 17 00:00:00 2001
From: MamasLT <admin@eastwesthost.com>
Date: Mon, 15 Mar 2021 18:27:26 +0000
Subject: [PATCH 342/420] Translated using Weblate (Lithuanian)

Currently translated at 65.8% (1901 of 2889 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/lt/
---
 src/i18n/strings/lt.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/lt.json b/src/i18n/strings/lt.json
index 1973247e66..6ba078ad64 100644
--- a/src/i18n/strings/lt.json
+++ b/src/i18n/strings/lt.json
@@ -79,7 +79,7 @@
     "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s naudoja daug išplėstinių naršyklės funkcijų, kai kurios iš jų yra neprieinamos arba eksperimentinės jūsų esamoje naršyklėje.",
     "Event sent!": "Įvykis išsiųstas!",
     "Unnamed room": "Kambarys be pavadinimo",
-    "Dismiss": "Atsisakyti",
+    "Dismiss": "Atmesti",
     "Explore Account Data": "Peržiūrėti paskyros duomenis",
     "Remove from Directory": "Pašalinti iš Katalogo",
     "Download this file": "Atsisiųsti šį failą",

From e53caed44ca8e7180f8e1aeb3c3e7a46ee1a4775 Mon Sep 17 00:00:00 2001
From: Besnik Bleta <besnik@programeshqip.org>
Date: Wed, 10 Mar 2021 18:17:45 +0000
Subject: [PATCH 343/420] Translated using Weblate (Albanian)

Currently translated at 99.6% (2878 of 2889 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/
---
 src/i18n/strings/sq.json | 117 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 116 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index dd58154b5a..cb08a6b5f9 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -3076,5 +3076,120 @@
     "Value": "Vlerë",
     "Failed to save settings": "S’u arrit të ruhen rregullimet",
     "Settings Explorer": "Eksplorues Rregullimesh",
-    "Show chat effects (animations when receiving e.g. confetti)": "Shfaq efekte fjalosjeje (animacione kur merren bonbone, për shembull)"
+    "Show chat effects (animations when receiving e.g. confetti)": "Shfaq efekte fjalosjeje (animacione kur merren bonbone, për shembull)",
+    "Original event source": "Burim i veprimtarisë origjinale",
+    "Decrypted event source": "U shfshehtëzua burim veprimtarie",
+    "We'll create rooms for each of them. You can add existing rooms after setup.": "Do të krijojmë dhoma për çdo një prej tyre. Pas ujdisjes mund të shtoni dhoma ekzistuese.",
+    "What projects are you working on?": "Me çfarë projektesh po merreni?",
+    "We'll create rooms for each topic.": "Do të krijojmë dhoma për çdo temë.",
+    "What are some things you want to discuss?": "Cilat janë disa nga gjërat që doni të diskutoni?",
+    "Inviting...": "Po ftohen…",
+    "Invite by username": "Ftoni përmes emri përdoruesi",
+    "Invite your teammates": "Ftoni anëtarët e ekipit tuaj",
+    "Failed to invite the following users to your space: %(csvUsers)s": "S’u arrit të ftoheshin te hapësira juaj përdoruesit vijues: %(csvUsers)s",
+    "A private space for you and your teammates": "Një hapësirë private për ju dhe anëtarët e ekipit tuaj",
+    "Me and my teammates": "Unë dhe anëtarët e ekipit tim",
+    "A private space just for you": "Një hapësirë private vetëm për ju",
+    "Just Me": "Vetëm Unë",
+    "Ensure the right people have access to the space.": "Siguroni që personat e duhur të mund të hyjnë te hapësira",
+    "Who are you working with?": "Me cilët po punoni?",
+    "Finish": "Përfundoje",
+    "At the moment only you can see it.": "Hëpërhë mund ta shihni vetëm ju.",
+    "Creating rooms...": "Po krijohen dhoma…",
+    "Skip for now": "Hëpërhë anashkaloje",
+    "Failed to create initial space rooms": "S’u arrit të krijohen dhomat fillestare të hapësirës",
+    "Room name": "Emër dhome",
+    "Support": "Asistencë",
+    "Random": "Kuturu",
+    "Welcome to <name/>": "Mirë se vini te <name/>",
+    "Your private space <name/>": "Hapësira juaj private <name/>",
+    "Your public space <name/>": "Hapësira juaj publike <name/>",
+    "You have been invited to <name/>": "Jeni ftuar te <name/>",
+    "<inviter/> invited you to <name/>": "<inviter/> ju ftoi te <name/>",
+    "%(count)s members|one": "%(count)s anëtar",
+    "%(count)s members|other": "%(count)s anëtarë",
+    "Your server does not support showing space hierarchies.": "Shërbyesi juaj nuk mbulon shfaqje hierarkish hapësire.",
+    "Default Rooms": "Dhoma Parazgjedhje",
+    "Add existing rooms & spaces": "Shtoni dhoma & hapësira ekzistuese",
+    "Accept Invite": "Pranoje Ftesën",
+    "Find a room...": "Gjeni një dhomë…",
+    "Manage rooms": "Administroni dhoma",
+    "Save changes": "Ruaji ndryshimet",
+    "You're in this room": "Gjendeni në këtë dhomë",
+    "You're in this space": "Gjendeni në këtë hapësirë",
+    "No permissions": "S’ka leje",
+    "Remove from Space": "Hiqe prej Hapësire",
+    "Undo": "Zhbëje",
+    "Your message wasn't sent because this homeserver has been blocked by it's administrator. Please <a>contact your service administrator</a> to continue using the service.": "Mesazhi juaj s’u dërgua, ngaqë ky shërbyes Home është bllokuar nga përgjegjësi i tij. Ju lutemi, që të vazhdoni ta përdorni këtë shërbim, <a>lidhuni me përgjegjësin e shërbimit tuaj</a>.",
+    "Are you sure you want to leave the space '%(spaceName)s'?": "Jeni i sigurt se doni të dilni nga hapësira '%(spaceName)s'?",
+    "This space is not public. You will not be able to rejoin without an invite.": "Kjo hapësirë s’është publike. S’do të jeni në gjendje të rihyni në të pa një ftesë.",
+    "Start audio stream": "Nisni transmetim audio",
+    "Unable to start audio streaming.": "S’arrihet të niset transmetim audio.",
+    "Save Changes": "Ruaji Ndryshimet",
+    "Saving...": "Po ruhet…",
+    "View dev tools": "Shihni mjete zhvilluesi",
+    "Leave Space": "Braktiseni Hapësirën",
+    "Make this space private": "Bëje këtë hapësirë private",
+    "Edit settings relating to your space.": "Përpunoni rregullime që lidhen me hapësirën tuaj",
+    "Space settings": "Rregullime hapësire",
+    "Failed to save space settings.": "S’u arrit të ruhen rregullime hapësire.",
+    "Invite someone using their name, username (like <userId/>) or <a>share this space</a>.": "Ftoni dikë duke përdorur emrin e tij, emrin e tij të përdoruesit (bie fjala, <userId/>) ose <a>ndani me të këtë hapësirë</a>.",
+    "Invite someone using their name, email address, username (like <userId/>) or <a>share this space</a>.": "Ftoni dikë duke përdorur emrin e tij, adresën email, emrin e përdoruesit (bie fjala, <userId/>) ose <a>ndani me të këtë hapësirë</a>.",
+    "Unnamed Space": "Hapësirë e Paemërtuar",
+    "Invite to %(spaceName)s": "Ftojeni te %(spaceName)s",
+    "Caution:": "Kujdes:",
+    "Setting ID": "ID Rregullimi",
+    "Failed to add rooms to space": "S’u arrit të shtoheshin dhomat te hapësira",
+    "Apply": "Aplikoje",
+    "Applying...": "Po aplikohet …",
+    "Create a new room": "Krijoni dhomë të re",
+    "Don't want to add an existing room?": "S’doni të shtoni një dhomë ekzistuese?",
+    "Spaces": "Hapësira",
+    "Filter your rooms and spaces": "Filtroni dhomat dhe hapësirat tuaja",
+    "Add existing spaces/rooms": "Shtoni hapësira/dhoma ekzistuese",
+    "Space selection": "Përzgjedhje hapësire",
+    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the space it will be impossible to regain privileges.": "S’do të jeni në gjendje ta zhbëni këtë ndryshim, teksa zhgradoni veten, nëse jeni përdoruesi i fundit i privilegjuar te hapësira, s’do të jetë e mundur të rifitoni privilegjet.",
+    "Empty room": "Dhomë e zbrazët",
+    "Suggested Rooms": "Roma të Këshilluara",
+    "Explore space rooms": "Eksploroni dhoma hapësire",
+    "You do not have permissions to add rooms to this space": "S’keni leje të shtoni dhoma në këtë hapësirë",
+    "Add existing room": "Shtoni dhomë ekzistuese",
+    "You do not have permissions to create new rooms in this space": "S’keni leje të krijoni dhoma të reja në këtë hapësirë",
+    "Send message": "Dërgoje mesazhin",
+    "Invite to this space": "Ftoni në këtë hapësirë",
+    "Your message was sent": "Mesazhi juaj u dërgua",
+    "Encrypting your message...": "Po fshehtëzohet meszhi juaj…",
+    "Sending your message...": "Po dërgohet mesazhi juaj…",
+    "Spell check dictionaries": "Fjalorë kontrolli drejtshkrimi",
+    "Space options": "Mundësi Hapësire",
+    "Space Home": "Shtëpi Hapësire",
+    "New room": "Dhomë e re",
+    "Leave space": "Braktiseni hapësirën",
+    "Invite people": "Ftoni njerëz",
+    "Share your public space": "Ndani me të tjerët hapësirën tuaj publike",
+    "Invite members": "Ftoni anëtarë",
+    "Invite by email or username": "Ftoni përmes email-i ose emri përdoruesi",
+    "Share invite link": "Jepuni lidhje ftese",
+    "Click to copy": "Klikoni që të kopjohet",
+    "Collapse space panel": "Tkurre panelin e hapësirave",
+    "Expand space panel": "Zgjeroje panelin e hapësirave",
+    "Creating...": "Po krijohet…",
+    "You can change these at any point.": "Këto mund ti ndryshoni kur të doni.",
+    "Give it a photo, name and description to help you identify it.": "Jepini një foto, emër dhe përshkrim, për t’ju ndihmuar ta indentifikoni.",
+    "Your private space": "Hapësira juaj private",
+    "Your public space": "Hapësira juaj publike",
+    "You can change this later": "Këtë mund ta ndryshoni më vonë",
+    "Invite only, best for yourself or teams": "Vetëm me ftesa, më e mira për ju dhe ekipe",
+    "Private": "Private",
+    "Open space for anyone, best for communities": "Hapësirë e hapur për këdo, më e mira për bashkësi",
+    "Public": "Publike",
+    "Spaces are new ways to group rooms and people. To join an existing space you’ll need an invite": "Hapësirat janë rrugë e re për të grupuar dhoma dhe njerëz. Për t’u bërë pjesë e një hapësire ekzistuese, do t’ju duhet një ftesë",
+    "Create a space": "Krijoni një hapësirë",
+    "Delete": "Fshije",
+    "Jump to the bottom of the timeline when you send a message": "Kalo te fundi i rrjedhës kohore, kur dërgoni një mesazh",
+    "Spaces prototype. Incompatible with Communities, Communities v2 and Custom Tags. Requires compatible homeserver for some features.": "Prototip hapësirash. I papërputhshëm me Bashkësi, Bashkësi v2 dhe Etiketa Vetjake. Për disa nga veçoritë, lyp shërbyes Home të përputhshëm.",
+    "This homeserver has been blocked by it's administrator.": "Ky shërbyes Home është bllokuar nga përgjegjësi i tij.",
+    "This homeserver has been blocked by its administrator.": "Ky shërbyes Home është bllokuar nga përgjegjësit e tij.",
+    "You're already in a call with this person.": "Gjendeni tashmë në thirrje me këtë person.",
+    "Already in call": "Tashmë në thirrje"
 }

From 69aea71a0b6efa13cb10681b07ccbe979c790022 Mon Sep 17 00:00:00 2001
From: Graeme Power <gjpower@tcd.ie>
Date: Sun, 14 Mar 2021 19:21:22 +0000
Subject: [PATCH 344/420] Translated using Weblate (Irish)

Currently translated at 22.9% (663 of 2889 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ga/
---
 src/i18n/strings/ga.json | 667 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 666 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/ga.json b/src/i18n/strings/ga.json
index 0967ef424b..4580e538ce 100644
--- a/src/i18n/strings/ga.json
+++ b/src/i18n/strings/ga.json
@@ -1 +1,666 @@
-{}
+{
+    "Sign in with": "Sínigh isteach le",
+    "Signing In...": "ag Síniú Isteach…",
+    "Sign in": "Sínigh Isteach",
+    "Already have an account? <a>Sign in here</a>": "An bhfuil cuntas agat cheana? <a>Sínigh isteach anseo</a>",
+    "Show less": "Taispeái níos lú",
+    "Show more": "Taispeáin níos mó",
+    "Show %(count)s more|one": "Taispeáin %(count)s níos mó",
+    "Show %(count)s more|other": "Taispeáin %(count)s níos mó",
+    "Switch to dark mode": "Athraigh go mód dorcha",
+    "Switch to light mode": "Athraigh go mód geal",
+    "User settings": "Socruithe úsáideora",
+    "Community settings": "Socruithe pobail",
+    "Notification settings": "Socruithe fógra",
+    "Got an account? <a>Sign in</a>": "An bhfuil cuntas agat? <a>Sínigh isteach</a>",
+    "New here? <a>Create an account</a>": "Céaduaire? <a>Cruthaigh cuntas</a>",
+    "All settings": "Gach Socrú",
+    "Security & Privacy": "Slándáil ⁊ Príobháideachas",
+    "Security & privacy": "Slándáil ⁊ príobháideachas",
+    "A verification email will be sent to your inbox to confirm setting your new password.": "Seolfar ríomhphost fíoraithe chuig do bhosca isteach chun a dhearbhú go bhfuil do phasfhocal nua socraithe.",
+    "Sign in instead": "Sínigh Isteach ina ionad sin",
+    "Send Reset Email": "Seol ríomhphost athshocruithe",
+    "What's new?": "Cad é nua?",
+    "New? <a>Create account</a>": "Céaduaire? <a>Cruthaigh cuntas</a>",
+    "Forgotten your password?": "An nDearna tú dearmad ar do fhocal faire?",
+    "Forgot password?": "An nDearna tú dearmad ar do fhocal faire?",
+    "Sign In or Create Account": "Sínigh Isteach nó Déan cuntas a chruthú",
+    "Autoplay GIFs and videos": "Uathsheinn GIFs agus físeáin",
+    "Are you sure you want to reject the invitation?": "An bhfuil tú cinnte gur mian leat an cuireadh a dhiúltú?",
+    "Are you sure you want to leave the room '%(roomName)s'?": "An bhfuil tú cinnte gur mian leat an seomra '%(roomName)s' a fhágáil?",
+    "Are you sure?": "An bhfuil tú cinnte?",
+    "Anyone who knows the room's link, including guests": "Duine ar bith a bhfuil eolas aige ar nasc an tseomra, aíonna san áireamh",
+    "Anyone who knows the room's link, apart from guests": "Duine ar bith a bhfuil eolas aige ar nasc an tseomra, seachas aíonna",
+    "An error has occurred.": "D’imigh earráid éigin.",
+    "%(senderName)s answered the call.": "D'fhreagair %(senderName)s an glao.",
+    "A new password must be entered.": "Caithfear focal faire nua a iontráil.",
+    "%(items)s and %(lastItem)s": "%(items)s agus %(lastItem)s",
+    "Always show message timestamps": "Taispeáin stampaí ama teachtaireachta i gcónaí",
+    "Alt Gr": "Alt Gr",
+    "Default Device": "Gléas Réamhshocraithe",
+    "No media permissions": "Gan cheadanna meáin",
+    "No Webcams detected": "Níor braitheadh aon ceamara gréasáin",
+    "No Microphones detected": "Níor braitheadh aon micreafón",
+    "Access Token:": "Licín Rochtana:",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "Ghlac %(targetName)s leis an cuireadh ó %(displayName)s.",
+    "%(targetName)s accepted an invitation.": "Ghlac %(targetName)s leis an cuireadh.",
+    "Waiting for answer": "ag Fanacht le freagra",
+    "%(senderName)s started a call": "Thosaigh %(senderName)s an glao",
+    "You started a call": "Thosaigh tú an glao",
+    "Call ended": "Críochnaíodh an glao",
+    "%(senderName)s ended the call": "Chríochnaigh %(senderName)s an glao",
+    "You ended the call": "Chríochnaigh tú an glao",
+    "Call in Progress": "Glaoch ar siúl",
+    "Call in progress": "Glaoch ar siúl",
+    "Unable to access microphone": "Ní féidir rochtain a fháil ar mhicreafón",
+    "Try using turn.matrix.org": "Déan iarracht turn.matrix.org a úsáid",
+    "Alternatively, you can try to use the public server at <code>turn.matrix.org</code>, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings.": "De rogha air sin, is féidir leat iarracht a dhéanamh an freastalaí poiblí ag <code>turn.matrix.org</code> a úsáid, ach ní bheidh sé seo chomh iontaofa, agus roinnfidh sé do sheoladh ip leis an freastalaí sin. Is féidir leat é seo a bhainistiú sa socruithe freisin.",
+    "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Iarr ar an riarthóir do fhreastalaí baile (<code>%(homeserverDomain)s</code>) freastalaí TURN a chumrú go bhfeidhmeoidh glaonna go hiontaofa.",
+    "Call failed due to misconfigured server": "Theip an glaoch de bharr freastalaí mícumraithe",
+    "Answered Elsewhere": "Tógtha in áit eile",
+    "The call could not be established": "Níor féidir an glaoch a bhunú",
+    "The remote side failed to pick up": "Níor thóg an taobh eile an glaoch",
+    "The other party declined the call.": "Dhiúltaigh an duine eile an glaoch.",
+    "Call Declined": "Glao Diúltaithe",
+    "Unable to load! Check your network connectivity and try again.": "Ní féidir a lódáil! Seiceáil do nascacht líonra agus bain triail eile as.",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "As chás go bhfuil eolas inaitheanta ar an leathanach seo, mar shampla ID seomra, úsáideora nó grúpa, baintear na sonraí sin sula seoltar chuig an bhfreastalaí iad.",
+    "The information being sent to us to help make %(brand)s better includes:": "Cuimsíonn an eolas a chuirtear chugainn chun cabhrú le %(brand)s a dhéanamh níos fearr:",
+    "Your device resolution": "Taifeach do gléas",
+    "Your user agent": "Do ghníomhaire úsáideora",
+    "The call was answered on another device.": "Do ghníomhaire úsáideora.",
+    "Every page you use in the app": "Gach leathanach a úsáideann tú san aip",
+    "Whether you're using %(brand)s as an installed Progressive Web App": "Má úsáideann tú %(brand)s mar feidhmchlár gréasáin forásach (PWA) suiteáilte",
+    "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Má úsáideann tú an gné “grabhróige aráin” (abhatáranna os cionn an liosta seomra)",
+    "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Má úsáideann tú %(brand)s ar gléas arb é an teagmháil an phríomh-mheicníocht ionchuir",
+    "Your homeserver's URL": "An URL do fhreastalaí baile",
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Má tá nó níl tú ag úsáid an modh téacs saibhir an eagarthóra téacs saibhir",
+    "Which officially provided instance you are using, if any": "Cén ásc a chuirtear ar fáil go hoifigiúil atá á úsáid agat, más ann dó",
+    "Your language of choice": "Do theanga roghnaithe",
+    "Whether or not you're logged in (we don't record your username)": "Má logáil nó níor logáil tú isteach (ní thaifeadaimid d'ainm úsáideora)",
+    "Failed to verify email address: make sure you clicked the link in the email": "Níor cinntíodh an seoladh ríomhphoist: déan cinnte gur chliceáil tú an nasc sa ríomhphost",
+    "Reject & Ignore user": "Diúltaigh ⁊ Neamaird do úsáideoir",
+    "Ignore": "Neamhaird",
+    "Ignored users": "Úsáideoirí neamhairde",
+    "Ignored/Blocked": "Neamhairde/Tachta",
+    "Message Pinning": "Ceangal teachtaireachta",
+    "Avoid sequences": "Seachain seicheamh",
+    "Unrecognised address": "Seoladh nár aithníodh",
+    "(no answer)": "(gan freagra)",
+    "Displays action": "Taispeáin gníomh",
+    "Verified key": "Eochair deimhnithe",
+    "Unignored user": "Úsáideoir leis aird",
+    "Ignored user": "Úsáideoir neamhairde",
+    "Unignore": "Stop ag tabhairt neamhaird air",
+    "Leave room": "Fág an seomra",
+    "Missing roomId.": "Comhartha aitheantais seomra ar iarraidh.",
+    "Operation failed": "Chlis an oibríocht",
+    "Unnamed Room": "Seomra gan ainm",
+    "%(weekDayName)s %(time)s": "%(weekDayName)s ar a %(time)s",
+    "Upload Failed": "Chlis an uaslódáil",
+    "Permission Required": "Is Teastáil Cead",
+    "Call Failed": "Chlis an glaoch",
+    "e.g. <CurrentPageURL>": "mar shampla <CurrentPageURL>",
+    "e.g. %(exampleValue)s": "mar shampla %(exampleValue)s",
+    "Inviting...": "ag Tabhairt cuireadh…",
+    "Finish": "Críochnaigh",
+    "Support": "Tacaíocht",
+    "Random": "Randamach",
+    "Undo": "Cuir ar ceal",
+    "Saving...": "ag Sábháil…",
+    "Apply": "Cuir i bhfeidhm",
+    "Applying...": "ag Cur i bhfeidhm…",
+    "Spaces": "Spásanna",
+    "Creating...": "ag Cruthú…",
+    "Private": "Príobháideach",
+    "Public": "Poiblí",
+    "Delete": "Bain amach",
+    "Value:": "Luach:",
+    "Level": "Leibhéal",
+    "Caution:": "Faichill:",
+    "Setting:": "Socrú:",
+    "Value": "Luach",
+    "Abort": "Tobscoir",
+    "Windows": "Fuinneoga",
+    "Screens": "Scáileáin",
+    "Transfer": "Aistrigh",
+    "Hold": "Fan",
+    "Resume": "Tosaigh arís",
+    "Effects": "Tionchair",
+    "Homeserver": "Freastalaí baile",
+    "Approve": "Ceadaigh",
+    "Filter": "Scag",
+    "Role": "Ról",
+    "Zimbabwe": "an tSiombáib",
+    "Zambia": "an tSaimbia",
+    "Yemen": "Éimin",
+    "Vietnam": "Vítneam",
+    "Venezuela": "Veiniséala",
+    "Vanuatu": "Vanuatú",
+    "Uzbekistan": "an Úisbéiceastáin",
+    "Uruguay": "Uragua",
+    "Ukraine": "an Úcráin",
+    "Uganda": "Uganda",
+    "Tuvalu": "Túvalú",
+    "Turkmenistan": "an Tuircméanastáin",
+    "Turkey": "an Tuirc",
+    "Tunisia": "an Túinéis",
+    "Tonga": "Tonga",
+    "Tokelau": "Oileáin Tokelau",
+    "Togo": "Tóga",
+    "Timor-Leste": "Tíomór Thoir",
+    "Thailand": "an Téalainn",
+    "Tanzania": "an Tansáin",
+    "Tajikistan": "an Táidsíceastáin",
+    "Taiwan": "an Téaváin",
+    "Syria": "an tSiria",
+    "Switzerland": "an Eilvéis",
+    "Sweden": "an tSualainn",
+    "Swaziland": "an tSuasalainn",
+    "Suriname": "Suranam",
+    "Sudan": "an tSúdáin",
+    "Spain": "an Spáinn",
+    "Somalia": "an tSomáil",
+    "Slovenia": "an tSlóivéin",
+    "Slovakia": "an tSlóvaic",
+    "Singapore": "Singeapór",
+    "Seychelles": "na Séiséil",
+    "Serbia": "an tSeirbia",
+    "Senegal": "an tSeineagáil",
+    "Samoa": "Samó",
+    "Réunion": "La Réunion",
+    "Rwanda": "Ruanda",
+    "Russia": "an Rúis",
+    "Romania": "an Rómáin",
+    "Qatar": "Catar",
+    "Portugal": "an Phortaingéil",
+    "Poland": "an Pholainn",
+    "Philippines": "na hOileáin Fhilipíneacha",
+    "Peru": "Peiriú",
+    "Paraguay": "Paragua",
+    "Panama": "Panama",
+    "Palestine": "an Phalaistín",
+    "Palau": "Oileáin Palau",
+    "Pakistan": "an Phacastáin",
+    "Oman": "Óman",
+    "Norway": "an Iorua",
+    "Niue": "Niue",
+    "Nigeria": "an Nigéir",
+    "Niger": "an Nígir",
+    "Nicaragua": "Nicearagua",
+    "Netherlands": "an Ísiltír",
+    "Nepal": "Neipeal",
+    "Nauru": "Nárú",
+    "Namibia": "an Namaib",
+    "Myanmar": "Maenmar",
+    "Mozambique": "Mósaimbíc",
+    "Morocco": "Maracó",
+    "Montserrat": "Montsarat",
+    "Montenegro": "Montainéagró",
+    "Mongolia": "an Mhongóil",
+    "Monaco": "Monacó",
+    "Moldova": "an Mholdóiv",
+    "Micronesia": "an Mhicrinéis",
+    "Mexico": "Meicsiceo",
+    "Mayotte": "Mayotte",
+    "Mauritius": "Oileán Mhuirís",
+    "Mauritania": "an Mháratáin",
+    "Martinique": "Martinique",
+    "Malta": "Málta",
+    "Mali": "Mailí",
+    "Maldives": "Oileáin Mhaildíve",
+    "Malaysia": "an Mhalaeisia",
+    "Malawi": "an Mhaláiv",
+    "Madagascar": "Madagascar",
+    "Macedonia": "an Mhacadóin",
+    "Macau": "Macau",
+    "Luxembourg": "Lucsamburg",
+    "Lithuania": "an Liotuáin",
+    "Liechtenstein": "Lichtinstéin",
+    "Libya": "an Libia",
+    "Liberia": "an Libéir",
+    "Lesotho": "Leosóta",
+    "Lebanon": "an Liobáin",
+    "Latvia": "an Laitvia",
+    "Laos": "Laos",
+    "Kyrgyzstan": "an Chirgeastáin",
+    "Kuwait": "Cuáit",
+    "Kosovo": "an Chosaiv",
+    "Kiribati": "Ciribeas",
+    "Kenya": "an Chéinia",
+    "Kazakhstan": "an Chasacstáin",
+    "Jordan": "an Iordáin",
+    "Jersey": "Geirsí",
+    "Japan": "an tSeapáin",
+    "Jamaica": "Iamáice",
+    "Italy": "an Iodáil",
+    "Israel": "Iosrael",
+    "Ireland": "Éire",
+    "Iraq": "an Iaráic",
+    "Iran": "an Iaráin",
+    "Indonesia": "an Indinéis",
+    "India": "an India",
+    "Iceland": "an Íoslainn",
+    "Hungary": "an Ungáir",
+    "Honduras": "Hondúras",
+    "Haiti": "Háití",
+    "Guyana": "an Ghuáin",
+    "Guinea-Bissau": "Guine Bissau",
+    "Guinea": "an Ghuine",
+    "Guernsey": "Geansaí",
+    "Guatemala": "Guatamala",
+    "Guam": "Guam",
+    "Guadeloupe": "Guadalúip",
+    "Grenada": "Greanáda",
+    "Greenland": "an Ghraonlainn",
+    "Greece": "an Ghréig",
+    "Gibraltar": "Giobráltar",
+    "Ghana": "Gána",
+    "Germany": "an Ghearmáin",
+    "Georgia": "an tSeoirsia",
+    "Gambia": "an Ghaimbia",
+    "Gabon": "an Ghabúin",
+    "France": "an Fhrainc",
+    "Finland": "an Fhionlainn",
+    "Fiji": "Fidsí",
+    "Ethiopia": "an Aetóip",
+    "Estonia": "an Eastóin",
+    "Eritrea": "an Eirtré",
+    "Egypt": "an Éigipt",
+    "Ecuador": "Eacuadór",
+    "Dominica": "Doiminice",
+    "Djibouti": "Djibouti",
+    "Denmark": "an Danmhairg",
+    "Cyprus": "an Chipir",
+    "Curaçao": "Curaçao",
+    "Cuba": "Cúba",
+    "Croatia": "an Chróit",
+    "Comoros": "Oileáin Chomóra",
+    "Colombia": "an Cholóim",
+    "China": "an tSín",
+    "Chile": "an tSile",
+    "Chad": "Sead",
+    "Canada": "Ceanada",
+    "Cameroon": "Camarún",
+    "Cambodia": "an Chambóid",
+    "Burundi": "an Bhurúin",
+    "Bulgaria": "an Bhulgáir",
+    "Brunei": "Brúiné",
+    "Brazil": "an Bhrasaíl",
+    "Botswana": "an Bhotsuáin",
+    "Bosnia": "an Bhoisnia agus an Heirseagaivéin",
+    "Bolivia": "an Bholaiv",
+    "Bhutan": "an Bhútáin",
+    "Bermuda": "Beirmiúda",
+    "Benin": "Beinin",
+    "Belize": "an Bheilís",
+    "Belgium": "an Bheilg",
+    "Belarus": "an Bhealarúis",
+    "Barbados": "Barbadós",
+    "Bangladesh": "an Bhanglaidéis",
+    "Bahrain": "Bairéin",
+    "Bahamas": "na Bahámaí",
+    "Azerbaijan": "an Asarbaiseáin",
+    "Austria": "an Ostair",
+    "Australia": "an Astráil",
+    "Aruba": "Arúba",
+    "Armenia": "an Airméin",
+    "Argentina": "an Airgintín",
+    "Antarctica": "Antartaice",
+    "Anguilla": "Angaíle",
+    "Angola": "Angóla",
+    "Andorra": "Andóra",
+    "Algeria": "an Ailgéir",
+    "Albania": "an Albáin",
+    "Afghanistan": "an Afganastáin",
+    "Comment": "Trácht",
+    "Pin": "Biorán",
+    "Widgets": "Giuirléidí",
+    "ready": "réidh",
+    "Algorithm:": "Algartam:",
+    "Unpin": "Neamhceangail",
+    "About": "Faoi",
+    "Privacy": "Príobháideachas",
+    "Show": "Taispeáin",
+    "Information": "Eolas",
+    "Away": "Imithe",
+    "Favourited": "Roghnaithe",
+    "Restore": "Athbhunaigh",
+    "Dark": "Dorcha",
+    "Light": "Geal",
+    "A-Z": "A-Z",
+    "Activity": "Gníomhaíocht",
+    "Feedback": "Aiseolas",
+    "People": "Daoine",
+    "Ok": "Togha",
+    "Categories": "Catagóire",
+    "Appearance": "Cuma",
+    "Syncing...": "ag Sioncrónú...",
+    "Verified": "Deimhnithe",
+    "End": "End",
+    "Space": "Spás",
+    "Enter": "Enter",
+    "Esc": "Esc",
+    "Ctrl": "Ctrl",
+    "Super": "Súpar",
+    "Shift": "Shift",
+    "Alt": "Alt",
+    "Autocomplete": "Uathiomlánaigh",
+    "Calls": "Glaonna",
+    "Navigation": "Nascleanúint",
+    "Matrix": "Matrix",
+    "Accepting…": "ag Glacadh leis…",
+    "Cancelling…": "ag Cealú…",
+    "exists": "a bheith ann",
+    "or": "nó",
+    "Copy": "Cóipeáil",
+    "Mod": "Mod",
+    "Bridges": "Droichid",
+    "Disable": "Cuir as feidhm",
+    "Enable": "Tosaigh",
+    "Manage": "Bainistigh",
+    "Review": "Athbhreithnigh",
+    "Later": "Níos deireanaí",
+    "Done": "Críochnaithe",
+    "Start": "Tosaigh",
+    "Lock": "Glasáil",
+    "Suggestions": "Moltaí",
+    "Go": "Téigh",
+    "Cross-signing": "Cros-síniú",
+    "Reactions": "Freagartha",
+    "Unencrypted": "Gan chriptiú",
+    "Upgrade": "Uasghrádaigh",
+    "Verify": "Cinntigh",
+    "Security": "Slándáil",
+    "Trusted": "Dílis",
+    "Subscribe": "Liostáil",
+    "Unsubscribe": "Díliostáil",
+    "None": "Níl aon cheann",
+    "Trust": "Cuir muinín i",
+    "React": "Freagair",
+    "Flags": "Bratacha",
+    "Symbols": "Siombailí",
+    "Objects": "Rudaí",
+    "Activities": "Gníomhaíochtaí",
+    "Document": "Cáipéis",
+    "Complete": "Críochnaigh",
+    "View": "Amharc",
+    "Preview": "Réamhamharc",
+    "Strikethrough": "Líne a chur trí",
+    "Italics": "Iodálach",
+    "Bold": "Trom",
+    "ID": "Comhartha aitheantais",
+    "Disconnect": "Dícheangail",
+    "Share": "Roinn le",
+    "Revoke": "Cúlghair",
+    "Discovery": "Aimsiú",
+    "Actions": "Gníomhartha",
+    "Messages": "Teachtaireachtaí",
+    "Retry": "Atriail",
+    "Success!": "Rath!",
+    "Download": "Íoslódáil",
+    "Import": "Iompórtáil",
+    "Export": "Easpórtáil",
+    "Name": "Ainm",
+    "Users": "Úsáideoirí",
+    "Emoji": "Straoiseog",
+    "Commands": "Ordú",
+    "Guest": "Cuairteoir",
+    "Room": "Seomra",
+    "Logout": "Logáil amach",
+    "Description": "Cuntas",
+    "Everyone": "Gach duine",
+    "Other": "Eile",
+    "Change": "Athraigh",
+    "Phone": "Guthán",
+    "Username": "Ainm úsáideora",
+    "Email": "Ríomhphost",
+    "Submit": "Cuir isteach",
+    "Code": "Cód",
+    "Home": "Tús",
+    "Hide": "Cuir i bhfolach",
+    "Favourite": "Cuir mar ceanán",
+    "Leave": "Fág",
+    "Quote": "Luaigh",
+    "Resend": "Athsheol",
+    "Upload": "Uaslódáil",
+    "Next": "Ar Aghaidh",
+    "Summary": "Achoimre",
+    "Service": "Seirbhís",
+    "Skip": "Léim",
+    "Refresh": "Athnuaigh",
+    "Toolbox": "Uirlisí",
+    "Back": "Ar Ais",
+    "Create": "Cruthaigh",
+    "example": "sampla",
+    "Example": "Sampla",
+    "Removing…": "ag Baint…",
+    "Changelog": "Loga na n-athruithe",
+    "Unavailable": "Níl sé ar fáil",
+    "Notes": "Nótaí",
+    "expand": "méadaigh",
+    "collapse": "cumaisc",
+    "%(oneUser)sleft %(count)s times|one": "D'fhág %(oneUser)s",
+    "%(severalUsers)sleft %(count)s times|one": "D'fhág %(severalUsers)s",
+    "%(oneUser)sjoined %(count)s times|one": "Tháinig %(oneUser)s isteach",
+    "%(severalUsers)sjoined %(count)s times|one": "Tháinig %(severalUsers)s isteach",
+    "Communities": "Pobail",
+    "Join": "Téigh isteach",
+    "Warning": "Rabhadh",
+    "Update": "Uasdátaigh",
+    "edited": "curtha in eagar",
+    "Copied!": "Cóipeáilte!",
+    "Attachment": "Ceangaltán",
+    "Options": "Roghanna",
+    "Edit": "Cuir in eagar",
+    "Reply": "Freagair",
+    "Yesterday": "Inné",
+    "Today": "Inniu",
+    "Saturday": "Dé Sathairn",
+    "Friday": "Dé hAoine",
+    "Thursday": "Déardaoin",
+    "Wednesday": "Dé Céadaoin",
+    "Tuesday": "Dé Máirt",
+    "Monday": "Dé Luain",
+    "Sunday": "Dé Domhnaigh",
+    "Members": "Baill",
+    "Stickerpack": "Pacáiste greamáin",
+    "Search…": "Cuardaigh…",
+    "Reject": "Diúltaigh",
+    "Re-join": "Téigh ar ais isteach",
+    "Historical": "Stairiúil",
+    "Rooms": "Seomraí",
+    "Favourites": "Ceanáin",
+    "Invites": "Cuirí",
+    "Search": "Cuardaigh",
+    "Settings": "Socruithe",
+    "Replying": "Ag freagairt",
+    "Unknown": "Anaithnid",
+    "Offline": "As líne",
+    "Idle": "Díomhaoin",
+    "Online": "Ar Líne",
+    "%(duration)sd": "%(duration)sl",
+    "%(duration)sh": "%(duration)su",
+    "%(duration)sm": "%(duration)sn",
+    "%(duration)ss": "%(duration)ss",
+    "Delete Backup": "Scrios cúltaca",
+    "Email Address": "Seoladh Ríomhphoist",
+    "Last seen": "Úsáid deireanach",
+    "Change Password": "Athraigh focal faire",
+    "Confirm password": "Deimhnigh focal faire",
+    "New Password": "Focal Faire Nua",
+    "Current password": "Focal faire reatha",
+    "Upload new:": "Uaslódáil nua:",
+    "Light bulb": "Bolgán solais",
+    "Thumbs up": "Ordógí suas",
+    "Got It": "Tuigthe",
+    "Call invitation": "Nuair a fhaighim cuireadh glaoigh",
+    "Collecting logs": "ag Bailiú logaí",
+    "Room Colour": "Dath an tSeomra",
+    "Loading...": "ag Lódáil...",
+    "Invited": "Le cuireadh",
+    "Close": "Dún",
+    "Mute": "Ciúinaigh",
+    "Unmute": "Stop ag ciúnú",
+    "Invite": "Tabhair cuireadh",
+    "Mention": "Luaigh",
+    "Demote": "Bain ceadanna",
+    "Ban": "Coisc",
+    "Kick": "Caith amach",
+    "Disinvite": "Tarraing siar cuireadh",
+    "Encrypted": "Criptithe",
+    "Encryption": "Criptiúchán",
+    "Anyone": "Aon duine",
+    "Permissions": "Ceadanna",
+    "Unban": "Bain an coisc",
+    "Browse": "Brabhsáil",
+    "Reset": "Athshocraigh",
+    "Sounds": "Fuaimeanna",
+    "Camera": "Ceamara",
+    "Microphone": "Micreafón",
+    "Cryptography": "Cripteagrafaíocht",
+    "Timeline": "Amlíne",
+    "Composer": "Eagarthóir",
+    "Preferences": "Roghanna",
+    "Notifications": "Fógraí",
+    "Versions": "Leaganacha",
+    "Labs": "Turgnaimh",
+    "FAQ": "Ceisteanna Coitianta - CC",
+    "Credits": "Creidiúintí",
+    "Legal": "Dlí",
+    "General": "Ginearálta",
+    "Theme": "Téama",
+    "Account": "Cuntas",
+    "Profile": "Próifíl",
+    "Success": "Rath",
+    "Flair": "Suaitheantas",
+    "Save": "Sábháil",
+    "Noisy": "Callánach",
+    "On": "Ar siúl",
+    "Off": "Múchta",
+    "Keywords": "Eochairfhocail",
+    "Advanced": "Forbartha",
+    "Add": "Cuir",
+    "Remove": "Bain",
+    "No": "Níl",
+    "Yes": "Tá",
+    "Authentication": "Fíordheimhniú",
+    "Password": "Pasfhocal",
+    "Warning!": "Aire!",
+    "Folder": "Fillteán",
+    "Headphones": "Cluasáin",
+    "Anchor": "Ancaire",
+    "Bell": "Cloigín",
+    "Trumpet": "Trumpa",
+    "Guitar": "Giotár",
+    "Ball": "Liathróid",
+    "Trophy": "Corn",
+    "Rocket": "Roicéad",
+    "Aeroplane": "Eitleán",
+    "Bicycle": "Rothar",
+    "Train": "Traein",
+    "Flag": "Bratach",
+    "Telephone": "Guthán",
+    "Hammer": "Casúr",
+    "Key": "Eochair",
+    "Scissors": "Siosúr",
+    "Paperclip": "Fáiscín páipéir",
+    "Pencil": "Peann luaidhe",
+    "Book": "Leabhar",
+    "Gift": "Bronntanas",
+    "Clock": "Clog",
+    "Hourglass": "Orláiste",
+    "Umbrella": "Scáth báistí",
+    "Santa": "Daidí na Nollag",
+    "Spanner": "Castaire",
+    "Glasses": "Spéaclaí",
+    "Hat": "Hata",
+    "Robot": "Róbat",
+    "Smiley": "Straoiseog",
+    "Heart": "Croí",
+    "Cake": "Cáca",
+    "Pizza": "Píotsa",
+    "Corn": "Grán buí",
+    "Strawberry": "Sú talún",
+    "Apple": "Úll",
+    "Banana": "Banana",
+    "Fire": "Tine",
+    "Cloud": "Scamall",
+    "Moon": "Gealach",
+    "Globe": "Cruinneog",
+    "Mushroom": "Muisiriún",
+    "Cactus": "Cachtas",
+    "Tree": "Crann",
+    "Flower": "Bláth",
+    "Butterfly": "Féileacán",
+    "Octopus": "Ochtapas",
+    "Fish": "Iasc",
+    "Turtle": "Turtar",
+    "Penguin": "Piongain",
+    "Rooster": "Coileach",
+    "Panda": "Panda",
+    "Rabbit": "Coinín",
+    "Elephant": "Eilifint",
+    "Pig": "Muc",
+    "Unicorn": "Aonbheannach",
+    "Horse": "Capall",
+    "Lion": "Leon",
+    "Cat": "Cat",
+    "Dog": "Madra",
+    "Cancel": "Cuir ar ceal",
+    "Verified!": "Deimhnithe!",
+    "OK": "Togha",
+    "Accept": "Glac",
+    "Decline": "Diúltaigh",
+    "Someone": "Duine éigin",
+    "Reason": "Cúis",
+    "Usage": "Úsáid",
+    "Admin": "Riarthóir",
+    "Moderator": "Modhnóir",
+    "Restricted": "Teoranta",
+    "Default": "Réamhshocrú",
+    "Register": "Cláraigh",
+    "Error": "Earráid",
+    "AM": "RN",
+    "PM": "IN",
+    "Dec": "Nol",
+    "Nov": "Saṁ",
+    "Oct": "DFó",
+    "Sep": "MFó",
+    "Aug": "Lún",
+    "Jul": "Iúil",
+    "Jun": "Meiṫ",
+    "May": "Beal",
+    "Apr": "Aib",
+    "Mar": "Már",
+    "Feb": "Feaḃ",
+    "Jan": "Ean",
+    "Sat": "Saṫ",
+    "Fri": "Aoi",
+    "Thu": "Déa",
+    "Wed": "Céa",
+    "Tue": "Mái",
+    "Mon": "Lua",
+    "Sun": "Doṁ",
+    "Send": "Seol",
+    "Continue": "Lean ar aghaidh",
+    "Analytics": "Anailísiú sonraí",
+    "The version of %(brand)s": "An leagan %(brand)s",
+    "The platform you're on": "An t-ardán ar a bhfuil tú",
+    "Add Phone Number": "Cuir uimhir ghutháin",
+    "Click the button below to confirm adding this phone number.": "Cliceáil an cnaipe thíos chun an uimhir ghutháin nua a dheimhniú.",
+    "Confirm adding phone number": "Deimhnigh an uimhir ghutháin nua",
+    "Confirm adding this phone number by using Single Sign On to prove your identity.": "Deimhnigh an uimhir ghutháin seo le SSO mar cruthúnas céannachta.",
+    "Add Email Address": "Cuir seoladh ríomhphoist",
+    "Confirm": "Deimhnigh",
+    "Click the button below to confirm adding this email address.": "Cliceáil an cnaipe thíos chun an seoladh ríomhphoist nua a dheimhniú.",
+    "Confirm adding email": "Deimhnigh an seoladh ríomhphoist nua",
+    "Single Sign On": "Single Sign On",
+    "Confirm adding this email address by using Single Sign On to prove your identity.": "Deimhnigh an seoladh ríomhphoist seo le SSO mar cruthúnas céannachta.",
+    "Explore rooms": "Breathnaigh thart ar na seomraí",
+    "Create Account": "Déan cuntas a chruthú",
+    "Sign In": "Sínigh Isteach",
+    "Dismiss": "Cuir uait",
+    "Use Single Sign On to continue": "Lean ar aghaidh le SSO",
+    "This phone number is already in use": "Úsáidtear an uimhir ghutháin seo chean féin",
+    "This email address is already in use": "Úsáidtear an seoladh ríomhphoist seo chean féin"
+}

From ff149ba1efb79ffbea5d64d1e8558a2a2a53fd2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Thu, 11 Mar 2021 19:04:56 +0000
Subject: [PATCH 345/420] Translated using Weblate (Estonian)

Currently translated at 96.1% (2778 of 2889 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
---
 src/i18n/strings/et.json | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index eb895f5f26..7ae8c1a4c1 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -1132,7 +1132,7 @@
     "Bridges": "Sõnumisillad",
     "Room Addresses": "Jututubade aadressid",
     "Browse": "Sirvi",
-    "Change room avatar": "Muuda jututoa profiilipilti ehk avatari",
+    "Change room avatar": "Muuda jututoa tunnuspilti ehk avatari",
     "Change main address for the room": "Muuda jututoa põhiaadressi",
     "Change history visibility": "Muuda vestlusajaloo nähtavust",
     "Change permissions": "Muuda õigusi",
@@ -3088,5 +3088,9 @@
     "Setting ID": "Seadistuse tunnus",
     "Failed to save settings": "Seadistuste salvestamine ei õnnestunud",
     "Settings Explorer": "Seadistuste haldur",
-    "Show chat effects (animations when receiving e.g. confetti)": "Näita vestluses edevat graafikat (näiteks kui keegi on saatnud serpentiine)"
+    "Show chat effects (animations when receiving e.g. confetti)": "Näita vestluses edevat graafikat (näiteks kui keegi on saatnud serpentiine)",
+    "This homeserver has been blocked by it's administrator.": "Ligipääs sellele koduserverile on sinu serveri haldaja poolt blokeeritud.",
+    "This homeserver has been blocked by its administrator.": "Ligipääs sellele koduserverile on sinu serveri haldaja poolt blokeeritud.",
+    "You're already in a call with this person.": "Sinul juba kõne käsil selle osapoolega.",
+    "Already in call": "Kõne on juba pooleli"
 }

From c73c302e1a6eb4ae03b3cfe8e2793fd813ea529e Mon Sep 17 00:00:00 2001
From: KAHINA <kahinamessaoudi03@gmail.com>
Date: Sun, 14 Mar 2021 22:29:04 +0000
Subject: [PATCH 346/420] Translated using Weblate (Kabyle)

Currently translated at 86.5% (2501 of 2889 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/kab/
---
 src/i18n/strings/kab.json | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/kab.json b/src/i18n/strings/kab.json
index 6c282af33c..c4e0cc7099 100644
--- a/src/i18n/strings/kab.json
+++ b/src/i18n/strings/kab.json
@@ -2749,5 +2749,10 @@
     "Prepends (╯°□°）╯︵ ┻━┻ to a plain-text message": "Yerna (╯°□°）╯︵ ┻━┻ ɣer tazwara n yizen",
     "This will end the conference for everyone. Continue?": "Aya ad yeḥbes asarag i yal yiwen. Kemmel?",
     "End conference": "Kfu asarag",
-    "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "Tawuri tecceḍ acku asawaḍ ur yessaweḍ ara ad yekcem. Senqed ma yella usawaḍ yeqqnen yerna yettusbadu akken iwata."
+    "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "Tawuri tecceḍ acku asawaḍ ur yessaweḍ ara ad yekcem. Senqed ma yella usawaḍ yeqqnen yerna yettusbadu akken iwata.",
+    "%(senderName)s declined the call.": "%(senderName)s yugi asiwel.",
+    "(an error occurred)": "(tella-d tuccḍa)",
+    "(connection failed)": "(tuqqna ur teddi ara)",
+    "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 Iqeddcen akk ttwagedlen seg uttekki! Taxxamt-a dayen ur tettuseqdac ara.",
+    "Try again": "Ɛreḍ tikkelt-nniḍen"
 }

From 720ac9d837332dc4ba6db9371b39c013d774d0ef Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 18 Mar 2021 14:45:14 -0600
Subject: [PATCH 347/420] Replace type declaration in Registration.tsx

---
 src/components/structures/auth/Registration.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/auth/Registration.tsx b/src/components/structures/auth/Registration.tsx
index 32bdddb82a..9d004de2ec 100644
--- a/src/components/structures/auth/Registration.tsx
+++ b/src/components/structures/auth/Registration.tsx
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import Matrix from 'matrix-js-sdk';
+import {createClient} from 'matrix-js-sdk/src/matrix';
 import React, {ReactNode} from 'react';
 import {MatrixClient} from "matrix-js-sdk/src/client";
 
@@ -181,7 +181,7 @@ export default class Registration extends React.Component<IProps, IState> {
         }
 
         const {hsUrl, isUrl} = serverConfig;
-        const cli = Matrix.createClient({
+        const cli = createClient({
             baseUrl: hsUrl,
             idBaseUrl: isUrl,
         });

From 1d9d0cd7be99f49da2b8a46f11d3777aca223fff Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 18 Mar 2021 20:50:34 -0600
Subject: [PATCH 348/420] Convert a bunch more js-sdk imports to absolute paths

Turns out a lot of the typescript warnings about improper warnings were correct. TypeScript appears to be pulling in two copies of the js-sdk when we do this, which can lead to type conflicts (or worse: the wrong code entirely). We fix this at the webpack level by explicitly importing from `src`, but some alternative build structures have broken tests because of this - jest ends up pulling in the "wrong" js-sdk, breaking things.
---
 src/CallMediaHandler.js                            | 14 +++++++-------
 src/IdentityAuthClient.js                          |  3 ++-
 src/Lifecycle.ts                                   |  7 +++----
 src/Login.ts                                       |  6 +++---
 src/PasswordReset.js                               |  4 ++--
 src/Resend.js                                      |  2 +-
 src/ScalarAuthClient.js                            |  4 ++--
 src/ScalarMessaging.js                             |  2 +-
 .../views/dialogs/security/ExportE2eKeysDialog.js  |  2 +-
 .../views/dialogs/security/ImportE2eKeysDialog.js  |  2 +-
 src/components/structures/FilePanel.js             |  2 +-
 src/components/structures/GroupView.js             |  2 +-
 src/components/structures/InteractiveAuth.js       |  2 +-
 src/components/structures/MatrixChat.tsx           |  5 ++---
 src/components/structures/RoomStatusBar.js         |  4 ++--
 src/components/structures/TimelinePanel.js         |  6 +++---
 src/components/structures/UserView.js              |  7 ++++---
 .../context_menus/GroupInviteTileContextMenu.js    |  2 +-
 .../views/context_menus/MessageContextMenu.js      |  2 +-
 .../views/dialogs/ConfirmUserActionDialog.js       |  2 +-
 src/components/views/dialogs/DevtoolsDialog.js     |  3 ++-
 src/components/views/dialogs/ReportEventDialog.js  |  2 +-
 .../dialogs/TabbedIntegrationManagerDialog.js      |  2 +-
 src/components/views/dialogs/TermsDialog.js        | 10 +++++-----
 .../dialogs/security/RestoreKeyBackupDialog.js     |  2 +-
 src/components/views/elements/Pill.js              |  3 ++-
 src/components/views/elements/ReplyThread.js       |  2 +-
 .../views/messages/EditHistoryMessage.js           |  2 +-
 src/components/views/messages/MessageActionBar.js  |  2 +-
 .../views/room_settings/RelatedGroupSettings.js    |  2 +-
 src/components/views/rooms/EditMessageComposer.js  |  2 +-
 src/components/views/rooms/EventTile.js            |  2 +-
 src/components/views/rooms/ThirdPartyMemberInfo.js |  2 +-
 .../settings/tabs/user/GeneralUserSettingsTab.js   |  2 +-
 src/indexing/EventIndex.js                         |  3 ++-
 src/utils/AutoDiscoveryUtils.js                    |  2 +-
 src/utils/EventUtils.js                            |  2 +-
 src/utils/IdentityServerUtils.js                   |  2 +-
 src/utils/StorageManager.js                        |  7 ++++---
 src/utils/createMatrixClient.js                    | 13 ++++++++-----
 40 files changed, 77 insertions(+), 70 deletions(-)

diff --git a/src/CallMediaHandler.js b/src/CallMediaHandler.js
index 8d56467c57..7c7940cab5 100644
--- a/src/CallMediaHandler.js
+++ b/src/CallMediaHandler.js
@@ -14,9 +14,9 @@
  limitations under the License.
 */
 
-import * as Matrix from 'matrix-js-sdk';
 import SettingsStore from "./settings/SettingsStore";
 import {SettingLevel} from "./settings/SettingLevel";
+import {setMatrixCallAudioInput, setMatrixCallAudioOutput, setMatrixCallVideoInput} from "matrix-js-sdk/src/matrix";
 
 export default {
     hasAnyLabeledDevices: async function() {
@@ -54,24 +54,24 @@ export default {
         const audioDeviceId = SettingsStore.getValue("webrtc_audioinput");
         const videoDeviceId = SettingsStore.getValue("webrtc_videoinput");
 
-        Matrix.setMatrixCallAudioOutput(audioOutDeviceId);
-        Matrix.setMatrixCallAudioInput(audioDeviceId);
-        Matrix.setMatrixCallVideoInput(videoDeviceId);
+        setMatrixCallAudioOutput(audioOutDeviceId);
+        setMatrixCallAudioInput(audioDeviceId);
+        setMatrixCallVideoInput(videoDeviceId);
     },
 
     setAudioOutput: function(deviceId) {
         SettingsStore.setValue("webrtc_audiooutput", null, SettingLevel.DEVICE, deviceId);
-        Matrix.setMatrixCallAudioOutput(deviceId);
+        setMatrixCallAudioOutput(deviceId);
     },
 
     setAudioInput: function(deviceId) {
         SettingsStore.setValue("webrtc_audioinput", null, SettingLevel.DEVICE, deviceId);
-        Matrix.setMatrixCallAudioInput(deviceId);
+        setMatrixCallAudioInput(deviceId);
     },
 
     setVideoInput: function(deviceId) {
         SettingsStore.setValue("webrtc_videoinput", null, SettingLevel.DEVICE, deviceId);
-        Matrix.setMatrixCallVideoInput(deviceId);
+        setMatrixCallVideoInput(deviceId);
     },
 
     getAudioOutput: function() {
diff --git a/src/IdentityAuthClient.js b/src/IdentityAuthClient.js
index d3bfee2380..9c6449f1e3 100644
--- a/src/IdentityAuthClient.js
+++ b/src/IdentityAuthClient.js
@@ -14,7 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { createClient, SERVICE_TYPES } from 'matrix-js-sdk';
+import { SERVICE_TYPES } from 'matrix-js-sdk/src/service-types';
+import { createClient } from 'matrix-js-sdk/src/matrix'
 
 import {MatrixClientPeg} from './MatrixClientPeg';
 import Modal from './Modal';
diff --git a/src/Lifecycle.ts b/src/Lifecycle.ts
index 7780d4c87a..b0a1292ba1 100644
--- a/src/Lifecycle.ts
+++ b/src/Lifecycle.ts
@@ -17,8 +17,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// @ts-ignore - XXX: tsc doesn't like this: our js-sdk imports are complex so this isn't surprising
-import Matrix from 'matrix-js-sdk';
+import { createClient } from 'matrix-js-sdk/src/matrix';
 import { InvalidStoreError } from "matrix-js-sdk/src/errors";
 import { MatrixClient } from "matrix-js-sdk/src/client";
 import {decryptAES, encryptAES} from "matrix-js-sdk/src/crypto/aes";
@@ -219,7 +218,7 @@ export function attemptTokenLogin(
             button: _t("Try again"),
             onFinished: tryAgain => {
                 if (tryAgain) {
-                    const cli = Matrix.createClient({
+                    const cli = createClient({
                         baseUrl: homeserver,
                         idBaseUrl: identityServer,
                     });
@@ -276,7 +275,7 @@ function registerAsGuest(
     console.log(`Doing guest login on ${hsUrl}`);
 
     // create a temporary MatrixClient to do the login
-    const client = Matrix.createClient({
+    const client = createClient({
         baseUrl: hsUrl,
     });
 
diff --git a/src/Login.ts b/src/Login.ts
index aecc0493c7..db3c4c11e4 100644
--- a/src/Login.ts
+++ b/src/Login.ts
@@ -19,7 +19,7 @@ limitations under the License.
 */
 
 // @ts-ignore - XXX: tsc doesn't like this: our js-sdk imports are complex so this isn't surprising
-import Matrix from "matrix-js-sdk";
+import {createClient} from "matrix-js-sdk/src/matrix";
 import { MatrixClient } from "matrix-js-sdk/src/client";
 import { IMatrixClientCreds } from "./MatrixClientPeg";
 import SecurityCustomisations from "./customisations/Security";
@@ -115,7 +115,7 @@ export default class Login {
      */
     public createTemporaryClient(): MatrixClient {
         if (this.tempClient) return this.tempClient; // use memoization
-        return this.tempClient = Matrix.createClient({
+        return this.tempClient = createClient({
             baseUrl: this.hsUrl,
             idBaseUrl: this.isUrl,
         });
@@ -210,7 +210,7 @@ export async function sendLoginRequest(
     loginType: string,
     loginParams: ILoginParams,
 ): Promise<IMatrixClientCreds> {
-    const client = Matrix.createClient({
+    const client = createClient({
         baseUrl: hsUrl,
         idBaseUrl: isUrl,
     });
diff --git a/src/PasswordReset.js b/src/PasswordReset.js
index b38a9de960..6fe6ca82cc 100644
--- a/src/PasswordReset.js
+++ b/src/PasswordReset.js
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import * as Matrix from 'matrix-js-sdk';
+import { createClient } from 'matrix-js-sdk/src/matrix';
 import { _t } from './languageHandler';
 
 /**
@@ -32,7 +32,7 @@ export default class PasswordReset {
      * @param {string} identityUrl The URL to the IS which has linked the email -> mxid mapping.
      */
     constructor(homeserverUrl, identityUrl) {
-        this.client = Matrix.createClient({
+        this.client = createClient({
             baseUrl: homeserverUrl,
             idBaseUrl: identityUrl,
         });
diff --git a/src/Resend.js b/src/Resend.js
index 5638313306..bf69e59c1a 100644
--- a/src/Resend.js
+++ b/src/Resend.js
@@ -17,7 +17,7 @@ limitations under the License.
 
 import {MatrixClientPeg} from './MatrixClientPeg';
 import dis from './dispatcher/dispatcher';
-import { EventStatus } from 'matrix-js-sdk';
+import { EventStatus } from 'matrix-js-sdk/src/models/event';
 
 export default class Resend {
     static resendUnsentEvents(room) {
diff --git a/src/ScalarAuthClient.js b/src/ScalarAuthClient.js
index 1ea9d39e2f..200b4fd7b9 100644
--- a/src/ScalarAuthClient.js
+++ b/src/ScalarAuthClient.js
@@ -21,9 +21,9 @@ import { Service, startTermsFlow, TermsNotSignedError } from './Terms';
 import {MatrixClientPeg} from "./MatrixClientPeg";
 import request from "browser-request";
 
-import * as Matrix from 'matrix-js-sdk';
 import SdkConfig from "./SdkConfig";
 import {WidgetType} from "./widgets/WidgetType";
+import {SERVICE_TYPES} from "matrix-js-sdk/src/service-types";
 
 // The version of the integration manager API we're intending to work with
 const imApiVersion = "1.1";
@@ -153,7 +153,7 @@ export default class ScalarAuthClient {
                 parsedImRestUrl.path = '';
                 parsedImRestUrl.pathname = '';
                 return startTermsFlow([new Service(
-                    Matrix.SERVICE_TYPES.IM,
+                    SERVICE_TYPES.IM,
                     parsedImRestUrl.format(),
                     token,
                 )], this.termsInteractionCallback).then(() => {
diff --git a/src/ScalarMessaging.js b/src/ScalarMessaging.js
index 896e27d92c..3f75b3788c 100644
--- a/src/ScalarMessaging.js
+++ b/src/ScalarMessaging.js
@@ -237,7 +237,7 @@ Example:
 */
 
 import {MatrixClientPeg} from './MatrixClientPeg';
-import { MatrixEvent } from 'matrix-js-sdk';
+import { MatrixEvent } from 'matrix-js-sdk/src/models/event';
 import dis from './dispatcher/dispatcher';
 import WidgetUtils from './utils/WidgetUtils';
 import RoomViewStore from './stores/RoomViewStore';
diff --git a/src/async-components/views/dialogs/security/ExportE2eKeysDialog.js b/src/async-components/views/dialogs/security/ExportE2eKeysDialog.js
index 4dd296a8f1..eeb68b94bd 100644
--- a/src/async-components/views/dialogs/security/ExportE2eKeysDialog.js
+++ b/src/async-components/views/dialogs/security/ExportE2eKeysDialog.js
@@ -19,7 +19,7 @@ import React, {createRef} from 'react';
 import PropTypes from 'prop-types';
 import { _t } from '../../../../languageHandler';
 
-import { MatrixClient } from 'matrix-js-sdk';
+import { MatrixClient } from 'matrix-js-sdk/src/client';
 import * as MegolmExportEncryption from '../../../../utils/MegolmExportEncryption';
 import * as sdk from '../../../../index';
 
diff --git a/src/async-components/views/dialogs/security/ImportE2eKeysDialog.js b/src/async-components/views/dialogs/security/ImportE2eKeysDialog.js
index e7bae3578b..670cb28b94 100644
--- a/src/async-components/views/dialogs/security/ImportE2eKeysDialog.js
+++ b/src/async-components/views/dialogs/security/ImportE2eKeysDialog.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React, {createRef} from 'react';
 import PropTypes from 'prop-types';
 
-import { MatrixClient } from 'matrix-js-sdk';
+import { MatrixClient } from 'matrix-js-sdk/src/client';
 import * as MegolmExportEncryption from '../../../../utils/MegolmExportEncryption';
 import * as sdk from '../../../../index';
 import { _t } from '../../../../languageHandler';
diff --git a/src/components/structures/FilePanel.js b/src/components/structures/FilePanel.js
index 9f5a0b6211..32db5c251c 100644
--- a/src/components/structures/FilePanel.js
+++ b/src/components/structures/FilePanel.js
@@ -18,7 +18,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 
-import {Filter} from 'matrix-js-sdk';
+import {Filter} from 'matrix-js-sdk/src/filter';
 import * as sdk from '../../index';
 import {MatrixClientPeg} from '../../MatrixClientPeg';
 import EventIndexPeg from "../../indexing/EventIndexPeg";
diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index f05d8d0758..b006b323fb 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -35,7 +35,7 @@ import GroupStore from '../../stores/GroupStore';
 import FlairStore from '../../stores/FlairStore';
 import { showGroupAddRoomDialog } from '../../GroupAddressPicker';
 import {makeGroupPermalink, makeUserPermalink} from "../../utils/permalinks/Permalinks";
-import {Group} from "matrix-js-sdk";
+import {Group} from "matrix-js-sdk/src/models/group";
 import {allSettled, sleep} from "../../utils/promise";
 import RightPanelStore from "../../stores/RightPanelStore";
 import AutoHideScrollbar from "./AutoHideScrollbar";
diff --git a/src/components/structures/InteractiveAuth.js b/src/components/structures/InteractiveAuth.js
index 9b61f71fd7..d419c9de6e 100644
--- a/src/components/structures/InteractiveAuth.js
+++ b/src/components/structures/InteractiveAuth.js
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {InteractiveAuth} from "matrix-js-sdk";
+import {InteractiveAuth} from "matrix-js-sdk/src/interactive-auth";
 import React, {createRef} from 'react';
 import PropTypes from 'prop-types';
 
diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index f0a3778a2b..a1117551fd 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -18,8 +18,7 @@ limitations under the License.
 */
 
 import React, { createRef } from 'react';
-// @ts-ignore - XXX: no idea why this import fails
-import * as Matrix from "matrix-js-sdk";
+import { createClient } from "matrix-js-sdk/src/matrix";
 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";
@@ -1649,7 +1648,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             let cli = MatrixClientPeg.get();
             if (!cli) {
                 const {hsUrl, isUrl} = this.props.serverConfig;
-                cli = Matrix.createClient({
+                cli = createClient({
                     baseUrl: hsUrl,
                     idBaseUrl: isUrl,
                 });
diff --git a/src/components/structures/RoomStatusBar.js b/src/components/structures/RoomStatusBar.js
index 8b70998be0..54b6fee233 100644
--- a/src/components/structures/RoomStatusBar.js
+++ b/src/components/structures/RoomStatusBar.js
@@ -16,7 +16,6 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import Matrix from 'matrix-js-sdk';
 import { _t, _td } from '../../languageHandler';
 import {MatrixClientPeg} from '../../MatrixClientPeg';
 import Resend from '../../Resend';
@@ -24,6 +23,7 @@ import dis from '../../dispatcher/dispatcher';
 import {messageForResourceLimitError, messageForSendError} from '../../utils/ErrorUtils';
 import {Action} from "../../dispatcher/actions";
 import {replaceableComponent} from "../../utils/replaceableComponent";
+import {EventStatus} from "matrix-js-sdk/src/models/event";
 
 const STATUS_BAR_HIDDEN = 0;
 const STATUS_BAR_EXPANDED = 1;
@@ -32,7 +32,7 @@ const STATUS_BAR_EXPANDED_LARGE = 2;
 function getUnsentMessages(room) {
     if (!room) { return []; }
     return room.getPendingEvents().filter(function(ev) {
-        return ev.status === Matrix.EventStatus.NOT_SENT;
+        return ev.status === EventStatus.NOT_SENT;
     });
 }
 
diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index f32b8ed0a9..ce13bb43fa 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -22,8 +22,8 @@ import {LayoutPropType} from "../../settings/Layout";
 import React, {createRef} from 'react';
 import ReactDOM from "react-dom";
 import PropTypes from 'prop-types';
-import {EventTimeline} from "matrix-js-sdk";
-import * as Matrix from "matrix-js-sdk";
+import {EventTimeline} from "matrix-js-sdk/src/models/event-timeline";
+import {TimelineWindow} from "matrix-js-sdk/src/timeline-window";
 import { _t } from '../../languageHandler';
 import {MatrixClientPeg} from "../../MatrixClientPeg";
 import UserActivity from "../../UserActivity";
@@ -1007,7 +1007,7 @@ class TimelinePanel extends React.Component {
      * returns a promise which will resolve when the load completes.
      */
     _loadTimeline(eventId, pixelOffset, offsetBase) {
-        this._timelineWindow = new Matrix.TimelineWindow(
+        this._timelineWindow = new TimelineWindow(
             MatrixClientPeg.get(), this.props.timelineSet,
             {windowLimit: this.props.timelineCap});
 
diff --git a/src/components/structures/UserView.js b/src/components/structures/UserView.js
index dc05193ece..6b472783bb 100644
--- a/src/components/structures/UserView.js
+++ b/src/components/structures/UserView.js
@@ -17,13 +17,14 @@ limitations under the License.
 
 import React from "react";
 import PropTypes from "prop-types";
-import Matrix from "matrix-js-sdk";
 import {MatrixClientPeg} from "../../MatrixClientPeg";
 import * as sdk from "../../index";
 import Modal from '../../Modal';
 import { _t } from '../../languageHandler';
 import HomePage from "./HomePage";
 import {replaceableComponent} from "../../utils/replaceableComponent";
+import {MatrixEvent} from "matrix-js-sdk/src/models/event";
+import {RoomMember} from "matrix-js-sdk/src/models/room-member";
 
 @replaceableComponent("structures.UserView")
 export default class UserView extends React.Component {
@@ -68,8 +69,8 @@ export default class UserView extends React.Component {
             this.setState({loading: false});
             return;
         }
-        const fakeEvent = new Matrix.MatrixEvent({type: "m.room.member", content: profileInfo});
-        const member = new Matrix.RoomMember(null, this.props.userId);
+        const fakeEvent = new MatrixEvent({type: "m.room.member", content: profileInfo});
+        const member = new RoomMember(null, this.props.userId);
         member.setMembershipEvent(fakeEvent);
         this.setState({member, loading: false});
     }
diff --git a/src/components/views/context_menus/GroupInviteTileContextMenu.js b/src/components/views/context_menus/GroupInviteTileContextMenu.js
index 11a9d90ac2..15078326b3 100644
--- a/src/components/views/context_menus/GroupInviteTileContextMenu.js
+++ b/src/components/views/context_menus/GroupInviteTileContextMenu.js
@@ -20,7 +20,7 @@ import PropTypes from 'prop-types';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import Modal from '../../../Modal';
-import {Group} from 'matrix-js-sdk';
+import {Group} from 'matrix-js-sdk/src/models/group';
 import GroupStore from "../../../stores/GroupStore";
 import {MenuItem} from "../../structures/ContextMenu";
 import {replaceableComponent} from "../../../utils/replaceableComponent";
diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js
index daabf224dc..56f070ba36 100644
--- a/src/components/views/context_menus/MessageContextMenu.js
+++ b/src/components/views/context_menus/MessageContextMenu.js
@@ -19,7 +19,7 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import {EventStatus} from 'matrix-js-sdk';
+import {EventStatus} from 'matrix-js-sdk/src/models/event';
 
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import dis from '../../../dispatcher/dispatcher';
diff --git a/src/components/views/dialogs/ConfirmUserActionDialog.js b/src/components/views/dialogs/ConfirmUserActionDialog.js
index 8cfd28986b..8059b9172a 100644
--- a/src/components/views/dialogs/ConfirmUserActionDialog.js
+++ b/src/components/views/dialogs/ConfirmUserActionDialog.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import { MatrixClient } from 'matrix-js-sdk';
+import { MatrixClient } from 'matrix-js-sdk/src/client';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import { GroupMemberType } from '../../../groups';
diff --git a/src/components/views/dialogs/DevtoolsDialog.js b/src/components/views/dialogs/DevtoolsDialog.js
index dfcc5d6dfb..9f5513e0a3 100644
--- a/src/components/views/dialogs/DevtoolsDialog.js
+++ b/src/components/views/dialogs/DevtoolsDialog.js
@@ -19,7 +19,6 @@ import PropTypes from 'prop-types';
 import * as sdk from '../../../index';
 import SyntaxHighlight from '../elements/SyntaxHighlight';
 import { _t } from '../../../languageHandler';
-import { Room, MatrixEvent } from "matrix-js-sdk";
 import Field from "../elements/Field";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import {useEventEmitter} from "../../../hooks/useEventEmitter";
@@ -39,6 +38,8 @@ import SettingsStore, {LEVEL_ORDER} from "../../../settings/SettingsStore";
 import Modal from "../../../Modal";
 import ErrorDialog from "./ErrorDialog";
 import {replaceableComponent} from "../../../utils/replaceableComponent";
+import {Room} from "matrix-js-sdk/src/models/room";
+import {MatrixEvent} from "matrix-js-sdk/src/models/event";
 
 class GenericEditor extends React.PureComponent {
     // static propTypes = {onBack: PropTypes.func.isRequired};
diff --git a/src/components/views/dialogs/ReportEventDialog.js b/src/components/views/dialogs/ReportEventDialog.js
index 67ed0f8f53..5454b97287 100644
--- a/src/components/views/dialogs/ReportEventDialog.js
+++ b/src/components/views/dialogs/ReportEventDialog.js
@@ -18,7 +18,7 @@ import React, {PureComponent} from 'react';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import PropTypes from "prop-types";
-import {MatrixEvent} from "matrix-js-sdk";
+import {MatrixEvent} from "matrix-js-sdk/src/models/event";
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import SdkConfig from '../../../SdkConfig';
 import Markdown from '../../../Markdown';
diff --git a/src/components/views/dialogs/TabbedIntegrationManagerDialog.js b/src/components/views/dialogs/TabbedIntegrationManagerDialog.js
index 07e29adcff..618b0b4347 100644
--- a/src/components/views/dialogs/TabbedIntegrationManagerDialog.js
+++ b/src/components/views/dialogs/TabbedIntegrationManagerDialog.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import {IntegrationManagers} from "../../../integrations/IntegrationManagers";
-import {Room} from "matrix-js-sdk";
+import {Room} from "matrix-js-sdk/src/models/room";
 import * as sdk from '../../../index';
 import {dialogTermsInteractionCallback, TermsNotSignedError} from "../../../Terms";
 import classNames from 'classnames';
diff --git a/src/components/views/dialogs/TermsDialog.js b/src/components/views/dialogs/TermsDialog.js
index 72e6c3f3a0..e8625ec6cb 100644
--- a/src/components/views/dialogs/TermsDialog.js
+++ b/src/components/views/dialogs/TermsDialog.js
@@ -20,8 +20,8 @@ import PropTypes from 'prop-types';
 import * as sdk from '../../../index';
 import { _t, pickBestLanguage } from '../../../languageHandler';
 
-import Matrix from 'matrix-js-sdk';
 import {replaceableComponent} from "../../../utils/replaceableComponent";
+import {SERVICE_TYPES} from "matrix-js-sdk/src/service-types";
 
 class TermsCheckbox extends React.PureComponent {
     static propTypes = {
@@ -85,22 +85,22 @@ export default class TermsDialog extends React.PureComponent {
 
     _nameForServiceType(serviceType, host) {
         switch (serviceType) {
-            case Matrix.SERVICE_TYPES.IS:
+            case SERVICE_TYPES.IS:
                 return <div>{_t("Identity Server")}<br />({host})</div>;
-            case Matrix.SERVICE_TYPES.IM:
+            case SERVICE_TYPES.IM:
                 return <div>{_t("Integration Manager")}<br />({host})</div>;
         }
     }
 
     _summaryForServiceType(serviceType) {
         switch (serviceType) {
-            case Matrix.SERVICE_TYPES.IS:
+            case SERVICE_TYPES.IS:
                 return <div>
                     {_t("Find others by phone or email")}
                     <br />
                     {_t("Be found by phone or email")}
                 </div>;
-            case Matrix.SERVICE_TYPES.IM:
+            case SERVICE_TYPES.IM:
                 return <div>
                     {_t("Use bots, bridges, widgets and sticker packs")}
                 </div>;
diff --git a/src/components/views/dialogs/security/RestoreKeyBackupDialog.js b/src/components/views/dialogs/security/RestoreKeyBackupDialog.js
index ca28ca094c..1fafe03d95 100644
--- a/src/components/views/dialogs/security/RestoreKeyBackupDialog.js
+++ b/src/components/views/dialogs/security/RestoreKeyBackupDialog.js
@@ -19,7 +19,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import * as sdk from '../../../../index';
 import {MatrixClientPeg} from '../../../../MatrixClientPeg';
-import { MatrixClient } from 'matrix-js-sdk';
+import { MatrixClient } from 'matrix-js-sdk/src/client';
 import { _t } from '../../../../languageHandler';
 import { accessSecretStorage } from '../../../../SecurityManager';
 
diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js
index e61d312305..d6c8aeb811 100644
--- a/src/components/views/elements/Pill.js
+++ b/src/components/views/elements/Pill.js
@@ -17,7 +17,8 @@ import React from 'react';
 import * as sdk from '../../../index';
 import dis from '../../../dispatcher/dispatcher';
 import classNames from 'classnames';
-import { Room, RoomMember } from 'matrix-js-sdk';
+import { Room } from 'matrix-js-sdk/src/models/room';
+import { RoomMember } from 'matrix-js-sdk/src/models/room-member'
 import PropTypes from 'prop-types';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import FlairStore from "../../../stores/FlairStore";
diff --git a/src/components/views/elements/ReplyThread.js b/src/components/views/elements/ReplyThread.js
index 2e0cc50435..870803995d 100644
--- a/src/components/views/elements/ReplyThread.js
+++ b/src/components/views/elements/ReplyThread.js
@@ -21,7 +21,7 @@ import {_t} from '../../../languageHandler';
 import PropTypes from 'prop-types';
 import dis from '../../../dispatcher/dispatcher';
 import {wantsDateSeparator} from '../../../DateUtils';
-import {MatrixEvent} from 'matrix-js-sdk';
+import {MatrixEvent} from 'matrix-js-sdk/src/models/event';
 import {makeUserPermalink, RoomPermalinkCreator} from "../../../utils/permalinks/Permalinks";
 import SettingsStore from "../../../settings/SettingsStore";
 import {LayoutPropType} from "../../../settings/Layout";
diff --git a/src/components/views/messages/EditHistoryMessage.js b/src/components/views/messages/EditHistoryMessage.js
index a298f7eb68..e2eda1e12a 100644
--- a/src/components/views/messages/EditHistoryMessage.js
+++ b/src/components/views/messages/EditHistoryMessage.js
@@ -19,7 +19,7 @@ import PropTypes from 'prop-types';
 import * as HtmlUtils from '../../../HtmlUtils';
 import { editBodyDiffToHtml } from '../../../utils/MessageDiffUtils';
 import {formatTime} from '../../../DateUtils';
-import {MatrixEvent} from 'matrix-js-sdk';
+import {MatrixEvent} from 'matrix-js-sdk/src/models/event';
 import {pillifyLinks, unmountPills} from '../../../utils/pillify';
 import { _t } from '../../../languageHandler';
 import * as sdk from '../../../index';
diff --git a/src/components/views/messages/MessageActionBar.js b/src/components/views/messages/MessageActionBar.js
index c33debe3f5..5a6e7d87b7 100644
--- a/src/components/views/messages/MessageActionBar.js
+++ b/src/components/views/messages/MessageActionBar.js
@@ -18,7 +18,7 @@ limitations under the License.
 
 import React, {useEffect} from 'react';
 import PropTypes from 'prop-types';
-import { EventStatus } from 'matrix-js-sdk';
+import { EventStatus } from 'matrix-js-sdk/src/models/event';
 
 import { _t } from '../../../languageHandler';
 import * as sdk from '../../../index';
diff --git a/src/components/views/room_settings/RelatedGroupSettings.js b/src/components/views/room_settings/RelatedGroupSettings.js
index f82e238722..272ecd1228 100644
--- a/src/components/views/room_settings/RelatedGroupSettings.js
+++ b/src/components/views/room_settings/RelatedGroupSettings.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import {MatrixEvent} from 'matrix-js-sdk';
+import {MatrixEvent} from 'matrix-js-sdk/src/models/event';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import Modal from '../../../Modal';
diff --git a/src/components/views/rooms/EditMessageComposer.js b/src/components/views/rooms/EditMessageComposer.js
index 6ecb2bd549..be04a50798 100644
--- a/src/components/views/rooms/EditMessageComposer.js
+++ b/src/components/views/rooms/EditMessageComposer.js
@@ -27,7 +27,7 @@ import {parseEvent} from '../../../editor/deserialize';
 import {PartCreator} from '../../../editor/parts';
 import EditorStateTransfer from '../../../utils/EditorStateTransfer';
 import classNames from 'classnames';
-import {EventStatus} from 'matrix-js-sdk';
+import {EventStatus} from 'matrix-js-sdk/src/models/event';
 import BasicMessageComposer from "./BasicMessageComposer";
 import {Key, isOnlyCtrlOrCmdKeyEvent} from "../../../Keyboard";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index cbe3252c2b..644d64d322 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -28,7 +28,7 @@ import * as sdk from "../../../index";
 import dis from '../../../dispatcher/dispatcher';
 import SettingsStore from "../../../settings/SettingsStore";
 import {Layout, LayoutPropType} from "../../../settings/Layout";
-import {EventStatus} from 'matrix-js-sdk';
+import {EventStatus} from 'matrix-js-sdk/src/models/event';
 import {formatTime} from "../../../DateUtils";
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import {ALL_RULE_TYPES} from "../../../mjolnir/BanList";
diff --git a/src/components/views/rooms/ThirdPartyMemberInfo.js b/src/components/views/rooms/ThirdPartyMemberInfo.js
index 5e2d82a1b2..67b86538c9 100644
--- a/src/components/views/rooms/ThirdPartyMemberInfo.js
+++ b/src/components/views/rooms/ThirdPartyMemberInfo.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
-import {MatrixEvent} from "matrix-js-sdk";
+import {MatrixEvent} from "matrix-js-sdk/src/models/event";
 import {_t} from "../../../languageHandler";
 import dis from "../../../dispatcher/dispatcher";
 import * as sdk from "../../../index";
diff --git a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
index 314acf5d65..b7dbfa4a3b 100644
--- a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
@@ -32,7 +32,7 @@ import * as sdk from "../../../../..";
 import Modal from "../../../../../Modal";
 import dis from "../../../../../dispatcher/dispatcher";
 import {Service, startTermsFlow} from "../../../../../Terms";
-import {SERVICE_TYPES} from "matrix-js-sdk";
+import {SERVICE_TYPES} from "matrix-js-sdk/src/service-types";
 import IdentityAuthClient from "../../../../../IdentityAuthClient";
 import {abbreviateUrl} from "../../../../../utils/UrlUtils";
 import { getThreepidsWithBindStatus } from '../../../../../boundThreepids';
diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index fa263a2a55..2dcdb9e3a3 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -16,7 +16,8 @@ limitations under the License.
 
 import PlatformPeg from "../PlatformPeg";
 import {MatrixClientPeg} from "../MatrixClientPeg";
-import {EventTimeline, RoomMember} from 'matrix-js-sdk';
+import {RoomMember} from 'matrix-js-sdk/src/models/room-member';
+import {EventTimeline} from 'matrix-js-sdk/src/models/event-timeline';
 import {sleep} from "../utils/promise";
 import SettingsStore from "../settings/SettingsStore";
 import {EventEmitter} from "events";
diff --git a/src/utils/AutoDiscoveryUtils.js b/src/utils/AutoDiscoveryUtils.js
index 18b6451d3e..614aa4cea8 100644
--- a/src/utils/AutoDiscoveryUtils.js
+++ b/src/utils/AutoDiscoveryUtils.js
@@ -16,7 +16,7 @@ limitations under the License.
 */
 
 import React from 'react';
-import {AutoDiscovery} from "matrix-js-sdk";
+import {AutoDiscovery} from "matrix-js-sdk/src/autodiscovery";
 import {_t, _td, newTranslatableError} from "../languageHandler";
 import {makeType} from "./TypeUtils";
 import SdkConfig from '../SdkConfig';
diff --git a/src/utils/EventUtils.js b/src/utils/EventUtils.js
index 6558a11ed4..be21896417 100644
--- a/src/utils/EventUtils.js
+++ b/src/utils/EventUtils.js
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { EventStatus } from 'matrix-js-sdk';
+import { EventStatus } from 'matrix-js-sdk/src/models/event';
 import {MatrixClientPeg} from '../MatrixClientPeg';
 import shouldHideEvent from "../shouldHideEvent";
 /**
diff --git a/src/utils/IdentityServerUtils.js b/src/utils/IdentityServerUtils.js
index 093d4eeabf..5ece308954 100644
--- a/src/utils/IdentityServerUtils.js
+++ b/src/utils/IdentityServerUtils.js
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { SERVICE_TYPES } from 'matrix-js-sdk';
+import { SERVICE_TYPES } from 'matrix-js-sdk/src/service-types';
 import SdkConfig from '../SdkConfig';
 import {MatrixClientPeg} from '../MatrixClientPeg';
 
diff --git a/src/utils/StorageManager.js b/src/utils/StorageManager.js
index c90281bacf..23c27a2d1c 100644
--- a/src/utils/StorageManager.js
+++ b/src/utils/StorageManager.js
@@ -14,9 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import Matrix from 'matrix-js-sdk';
 import {LocalStorageCryptoStore} from 'matrix-js-sdk/src/crypto/store/localStorage-crypto-store';
 import Analytics from '../Analytics';
+import {IndexedDBStore} from "matrix-js-sdk/src/store/indexeddb";
+import {IndexedDBCryptoStore} from "matrix-js-sdk/src/crypto/store/indexeddb-crypto-store";
 
 const localStorage = window.localStorage;
 
@@ -132,7 +133,7 @@ export async function checkConsistency() {
 async function checkSyncStore() {
     let exists = false;
     try {
-        exists = await Matrix.IndexedDBStore.exists(
+        exists = await IndexedDBStore.exists(
             indexedDB, SYNC_STORE_NAME,
         );
         log(`Sync store using IndexedDB contains data? ${exists}`);
@@ -148,7 +149,7 @@ async function checkSyncStore() {
 async function checkCryptoStore() {
     let exists = false;
     try {
-        exists = await Matrix.IndexedDBCryptoStore.exists(
+        exists = await IndexedDBCryptoStore.exists(
             indexedDB, CRYPTO_STORE_NAME,
         );
         log(`Crypto store using IndexedDB contains data? ${exists}`);
diff --git a/src/utils/createMatrixClient.js b/src/utils/createMatrixClient.js
index c8ff35a584..f5e196d846 100644
--- a/src/utils/createMatrixClient.js
+++ b/src/utils/createMatrixClient.js
@@ -14,7 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import * as Matrix from 'matrix-js-sdk';
+import {createClient} from "matrix-js-sdk/src/matrix";
+import {IndexedDBCryptoStore} from "matrix-js-sdk/src/crypto/store/indexeddb-crypto-store";
+import {WebStorageSessionStore} from "matrix-js-sdk/src/store/session/webstorage";
+import {IndexedDBStore} from "matrix-js-sdk/src/store/indexeddb";
 
 const localStorage = window.localStorage;
 
@@ -44,7 +47,7 @@ export default function createMatrixClient(opts) {
     };
 
     if (indexedDB && localStorage) {
-        storeOpts.store = new Matrix.IndexedDBStore({
+        storeOpts.store = new IndexedDBStore({
             indexedDB: indexedDB,
             dbName: "riot-web-sync",
             localStorage: localStorage,
@@ -53,18 +56,18 @@ export default function createMatrixClient(opts) {
     }
 
     if (localStorage) {
-        storeOpts.sessionStore = new Matrix.WebStorageSessionStore(localStorage);
+        storeOpts.sessionStore = new WebStorageSessionStore(localStorage);
     }
 
     if (indexedDB) {
-        storeOpts.cryptoStore = new Matrix.IndexedDBCryptoStore(
+        storeOpts.cryptoStore = new IndexedDBCryptoStore(
             indexedDB, "matrix-js-sdk:crypto",
         );
     }
 
     opts = Object.assign(storeOpts, opts);
 
-    return Matrix.createClient(opts);
+    return createClient(opts);
 }
 
 createMatrixClient.indexedDbWorkerScript = null;

From be8ee1a576fb9eff9d8753736ae3e6183378110a Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 18 Mar 2021 21:05:51 -0600
Subject: [PATCH 349/420] Appease the linter

---
 src/IdentityAuthClient.js             | 2 +-
 src/components/views/elements/Pill.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/IdentityAuthClient.js b/src/IdentityAuthClient.js
index 9c6449f1e3..1687adf13b 100644
--- a/src/IdentityAuthClient.js
+++ b/src/IdentityAuthClient.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import { SERVICE_TYPES } from 'matrix-js-sdk/src/service-types';
-import { createClient } from 'matrix-js-sdk/src/matrix'
+import { createClient } from 'matrix-js-sdk/src/matrix';
 
 import {MatrixClientPeg} from './MatrixClientPeg';
 import Modal from './Modal';
diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js
index d6c8aeb811..a8e16813e6 100644
--- a/src/components/views/elements/Pill.js
+++ b/src/components/views/elements/Pill.js
@@ -18,7 +18,7 @@ import * as sdk from '../../../index';
 import dis from '../../../dispatcher/dispatcher';
 import classNames from 'classnames';
 import { Room } from 'matrix-js-sdk/src/models/room';
-import { RoomMember } from 'matrix-js-sdk/src/models/room-member'
+import { RoomMember } from 'matrix-js-sdk/src/models/room-member';
 import PropTypes from 'prop-types';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import FlairStore from "../../../stores/FlairStore";

From c2cc0862179b987fa0367fcbb5169391cb6a50a2 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 18 Mar 2021 21:24:02 -0600
Subject: [PATCH 350/420] Import the js-sdk at the index so the `request`
 object gets set

Now that all the imports are replaced, we need to set up the js-sdk somewhere. Might as well do it in the index of the react-sdk where callers will be relying on those skin functions.
---
 src/index.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/index.js b/src/index.js
index 008e15ad90..e360c04f4f 100644
--- a/src/index.js
+++ b/src/index.js
@@ -28,3 +28,7 @@ export function resetSkin() {
 export function getComponent(componentName) {
     return Skinner.getComponent(componentName);
 }
+
+// Import the js-sdk so the proper `request` object can be set. This does some
+// magic with the browser injection to make all subsequent imports work fine.
+import "matrix-js-sdk";

From 1d43c8b7913690f6558cab26322d8443e3a5f1fd Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 18 Mar 2021 23:28:59 -0600
Subject: [PATCH 351/420] Remove forgotten rooms from the room list once
 forgotten

Fixes https://github.com/vector-im/element-web/issues/15559

This isn't exactly perfect as an implementation: if the user refreshes immediately after forgetting then there is a good chance the room re-appears because of the sync accumulator. At the very least this change makes it so in *most* cases the room goes away, which is probably good enough until https://github.com/vector-im/element-web/issues/14038 can be implemented properly.
---
 src/components/structures/MatrixChat.tsx |  8 ++++++++
 src/stores/room-list/RoomListStore.ts    | 12 ++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index f0a3778a2b..98c7421f9d 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -85,6 +85,8 @@ import { showToast as showMobileGuideToast } from '../../toasts/MobileGuideToast
 import SpaceStore from "../../stores/SpaceStore";
 import SpaceRoomDirectory from "./SpaceRoomDirectory";
 import {replaceableComponent} from "../../utils/replaceableComponent";
+import RoomListStore from "../../stores/room-list/RoomListStore";
+import {RoomUpdateCause} from "../../stores/room-list/models";
 
 /** constants for MatrixChat.state.view */
 export enum Views {
@@ -1140,11 +1142,17 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
     }
 
     private forgetRoom(roomId: string) {
+        const room = MatrixClientPeg.get().getRoom(roomId);
         MatrixClientPeg.get().forget(roomId).then(() => {
             // Switch to home page if we're currently viewing the forgotten room
             if (this.state.currentRoomId === roomId) {
                 dis.dispatch({ action: "view_home_page" });
             }
+
+            // We have to manually update the room list because the forgotten room will not
+            // be notified to us, therefore the room list will have no other way of knowing
+            // the room is forgotten.
+            RoomListStore.instance.manualRoomUpdate(room, RoomUpdateCause.RoomRemoved);
         }).catch((err) => {
             const errCode = err.errcode || _td("unknown error code");
             Modal.createTrackedDialog("Failed to forget room", '', ErrorDialog, {
diff --git a/src/stores/room-list/RoomListStore.ts b/src/stores/room-list/RoomListStore.ts
index 3f415f946d..074c2e569d 100644
--- a/src/stores/room-list/RoomListStore.ts
+++ b/src/stores/room-list/RoomListStore.ts
@@ -655,6 +655,18 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
         if (!algorithmTags) return [DefaultTagID.Untagged];
         return algorithmTags;
     }
+
+    /**
+     * Manually update a room with a given cause. This should only be used if the
+     * room list store would otherwise be incapable of doing the update itself. Note
+     * that this may race with the room list's regular operation.
+     * @param {Room} room The room to update.
+     * @param {RoomUpdateCause} cause The cause to update for.
+     */
+    public async manualRoomUpdate(room: Room, cause: RoomUpdateCause) {
+        await this.handleRoomUpdate(room, cause);
+        this.updateFn.trigger();
+    }
 }
 
 export default class RoomListStore {

From 4a734ef70ba322bbd726a711eb4e0f1d802f0677 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 19 Mar 2021 11:29:14 +0000
Subject: [PATCH 352/420] Clear displayname / vatar if they're unset

---
 src/stores/OwnProfileStore.ts | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/stores/OwnProfileStore.ts b/src/stores/OwnProfileStore.ts
index 398532a5c8..bb45456f1e 100644
--- a/src/stores/OwnProfileStore.ts
+++ b/src/stores/OwnProfileStore.ts
@@ -124,8 +124,16 @@ export class OwnProfileStore extends AsyncStoreWithClient<IState> {
         // We specifically do not use the User object we stored for profile info as it
         // could easily be wrong (such as per-room instead of global profile).
         const profileInfo = await this.matrixClient.getProfileInfo(this.matrixClient.getUserId());
-        if (profileInfo.displayname) window.localStorage.setItem(KEY_DISPLAY_NAME, profileInfo.displayname);
-        if (profileInfo.avatar_url) window.localStorage.setItem(KEY_AVATAR_URL, profileInfo.avatar_url);
+        if (profileInfo.displayname) {
+            window.localStorage.setItem(KEY_DISPLAY_NAME, profileInfo.displayname);
+        } else {
+            window.localStorage.removeItem(KEY_DISPLAY_NAME);
+        }
+        if (profileInfo.avatar_url) {
+            window.localStorage.setItem(KEY_AVATAR_URL, profileInfo.avatar_url);
+        } else {
+            window.localStorage.removeItem(KEY_AVATAR_URL);
+        }
         await this.updateState({displayName: profileInfo.displayname, avatarUrl: profileInfo.avatar_url});
     };
 

From d04c8b3fb417fc9cc3eedcc78d3d8b4a84de035a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 19 Mar 2021 11:36:36 +0000
Subject: [PATCH 353/420] Improve discovery of rooms in a space

---
 res/css/structures/_SpaceRoomDirectory.scss   | 271 +++++---
 res/img/element-icons/warning-badge.svg       |   6 +-
 .../structures/SpaceRoomDirectory.tsx         | 635 +++++++++---------
 src/components/structures/SpaceRoomView.tsx   |   9 +-
 .../views/elements/TextWithTooltip.js         |  10 +-
 src/i18n/strings/en_EN.json                   |  32 +-
 6 files changed, 527 insertions(+), 436 deletions(-)

diff --git a/res/css/structures/_SpaceRoomDirectory.scss b/res/css/structures/_SpaceRoomDirectory.scss
index b14e92a1af..b20554166a 100644
--- a/res/css/structures/_SpaceRoomDirectory.scss
+++ b/res/css/structures/_SpaceRoomDirectory.scss
@@ -31,7 +31,8 @@ limitations under the License.
         display: flex;
 
         .mx_BaseAvatar {
-            margin-right: 16px;
+            margin-right: 12px;
+            align-self: center;
         }
 
         .mx_BaseAvatar_image {
@@ -47,6 +48,7 @@ limitations under the License.
             }
 
             > div {
+                font-weight: 400;
                 color: $secondary-fg-color;
                 font-size: $font-15px;
                 line-height: $font-24px;
@@ -55,38 +57,71 @@ limitations under the License.
     }
 
     .mx_Dialog_content {
-        // TODO fix scrollbar
-        //display: flex;
-        //flex-direction: column;
-        //height: calc(100% - 80px);
-
         .mx_AccessibleButton_kind_link {
             padding: 0;
         }
 
         .mx_SearchBox {
-            margin: 24px 0 28px;
+            margin: 24px 0 16px;
+        }
+
+        .mx_SpaceRoomDirectory_noResults {
+            text-align: center;
+
+            > div {
+                font-size: $font-15px;
+                line-height: $font-24px;
+                color: $secondary-fg-color;
+            }
         }
 
         .mx_SpaceRoomDirectory_listHeader {
             display: flex;
-            font-size: $font-12px;
-            line-height: $font-15px;
-            color: $secondary-fg-color;
+            min-height: 32px;
+            align-items: center;
+            font-size: $font-15px;
+            line-height: $font-24px;
+            color: $primary-fg-color;
 
-            .mx_FormButton {
-                margin-bottom: 8px;
+            .mx_AccessibleButton {
+                padding: 2px 8px;
+                font-weight: normal;
+
+                & + .mx_AccessibleButton {
+                    margin-left: 16px;
+                }
             }
 
             > span {
-                margin: auto 0 0 auto;
+                margin-left: auto;
+            }
+        }
+
+        .mx_SpaceRoomDirectory_error {
+            position: relative;
+            font-weight: $font-semi-bold;
+            color: $notice-primary-color;
+            font-size: $font-15px;
+            line-height: $font-18px;
+            margin: 20px auto 12px;
+            padding-left: 24px;
+            width: max-content;
+
+            &::before {
+                content: "";
+                position: absolute;
+                height: 16px;
+                width: 16px;
+                left: 0;
+                background-image: url("$(res)/img/element-icons/warning-badge.svg");
             }
         }
     }
 }
 
 .mx_SpaceRoomDirectory_list {
-    margin-top: 8px;
+    margin-top: 16px;
+    padding-bottom: 40px;
 
     .mx_SpaceRoomDirectory_roomCount {
         > h3 {
@@ -106,115 +141,128 @@ limitations under the License.
     }
 
     .mx_SpaceRoomDirectory_subspace {
-        margin-top: 8px;
-
-        .mx_SpaceRoomDirectory_subspace_info {
-            display: flex;
-            flex-direction: row;
-            align-items: center;
-            margin-bottom: 8px;
-            color: $secondary-fg-color;
-            font-weight: $font-semi-bold;
-            font-size: $font-12px;
-            line-height: $font-15px;
-
-            .mx_BaseAvatar {
-                margin-right: 12px;
-                vertical-align: middle;
-            }
-
-            .mx_BaseAvatar_image {
-                border-radius: 8px;
-            }
-
-            .mx_SpaceRoomDirectory_actions {
-                text-align: right;
-                height: min-content;
-                margin-left: auto;
-                margin-right: 16px;
-                display: inline-flex;
-            }
-        }
-
-        .mx_SpaceRoomDirectory_subspace_children {
-            margin-left: 12px;
-            border-left: 2px solid $space-button-outline-color;
-            padding-left: 24px;
+        .mx_BaseAvatar_image {
+            border-radius: 8px;
         }
     }
 
-    .mx_SpaceRoomDirectory_roomTile {
-        padding: 16px;
-        border-radius: 8px;
-        border: 1px solid $space-button-outline-color;
-        margin: 8px 0 16px;
-        display: flex;
-        min-height: 76px;
-        box-sizing: border-box;
+    .mx_SpaceRoomDirectory_subspace_toggle {
+        position: absolute;
+        left: -1px;
+        top: 10px;
+        height: 16px;
+        width: 16px;
+        border-radius: 4px;
+        background-color: $primary-bg-color;
 
-        &.mx_AccessibleButton:hover {
-            background-color: rgba(141, 151, 165, 0.1);
+        &::before {
+            content: '';
+            position: absolute;
+            top: 0;
+            left: 0;
+            height: 16px;
+            width: 16px;
+            mask-repeat: no-repeat;
+            mask-position: center;
+            background-color: $tertiary-fg-color;
+            mask-size: 16px;
+            transform: rotate(270deg);
+            mask-image: url('$(res)/img/feather-customised/chevron-down.svg');
         }
 
+        &.mx_SpaceRoomDirectory_subspace_toggle_shown::before {
+            transform: rotate(0deg);
+        }
+    }
+
+    .mx_SpaceRoomDirectory_subspace_children {
+        position: relative;
+        padding-left: 12px;
+    }
+
+    .mx_SpaceRoomDirectory_roomTile {
+        position: relative;
+        padding: 6px 16px;
+        border-radius: 8px;
+        min-height: 56px;
+        box-sizing: border-box;
+
+        display: grid;
+        grid-template-columns: 20px auto max-content;
+        grid-column-gap: 8px;
+        align-items: center;
+
         .mx_BaseAvatar {
-            margin-right: 16px;
-            margin-top: 6px;
+            grid-row: 1;
+            grid-column: 1;
+        }
+
+        .mx_SpaceRoomDirectory_roomTile_name {
+            font-weight: $font-semi-bold;
+            font-size: $font-15px;
+            line-height: $font-18px;
+            grid-row: 1;
+            grid-column: 2;
+
+            .mx_InfoTooltip {
+                display: inline;
+                margin-left: 12px;
+                color: $tertiary-fg-color;
+                font-size: $font-12px;
+                line-height: $font-15px;
+
+                .mx_InfoTooltip_icon {
+                    margin-right: 4px;
+                }
+            }
         }
 
         .mx_SpaceRoomDirectory_roomTile_info {
-            display: inline-block;
-            font-size: $font-15px;
-            flex-grow: 1;
-            height: min-content;
-            margin: auto 0;
-
-            .mx_SpaceRoomDirectory_roomTile_name {
-                font-weight: $font-semi-bold;
-                line-height: $font-18px;
-            }
-            .mx_SpaceRoomDirectory_roomTile_topic {
-                line-height: $font-24px;
-                color: $secondary-fg-color;
-            }
-        }
-
-        .mx_SpaceRoomDirectory_roomTile_memberCount {
-            position: relative;
-            margin: auto 0 auto 24px;
-            padding: 0 0 0 28px;
-            line-height: $font-24px;
-            display: inline-block;
-            width: 32px;
-
-            &::before {
-                position: absolute;
-                content: '';
-                width: 24px;
-                height: 24px;
-                top: 0;
-                left: 0;
-                mask-position: center;
-                mask-repeat: no-repeat;
-                mask-size: contain;
-                background-color: $secondary-fg-color;
-                mask-image: url('$(res)/img/element-icons/community-members.svg');
-            }
+            font-size: $font-12px;
+            line-height: $font-15px;
+            color: $tertiary-fg-color;
+            grid-row: 2;
+            grid-column: 1/3;
         }
 
         .mx_SpaceRoomDirectory_actions {
-            width: 180px;
             text-align: right;
-            margin-left: 28px;
-            display: inline-flex;
-            align-items: center;
+            margin-left: 20px;
+            grid-column: 3;
+            grid-row: 1/3;
 
             .mx_AccessibleButton {
-                vertical-align: middle;
+                padding: 6px 18px;
 
-                & + .mx_AccessibleButton {
-                    margin-left: 24px;
-                }
+                display: none;
             }
+
+            .mx_Checkbox {
+                display: inline-flex;
+                vertical-align: middle;
+                margin-left: 12px;
+            }
+        }
+
+        &:hover {
+            background-color: $groupFilterPanel-bg-color;
+
+            .mx_AccessibleButton {
+                display: inline-block;
+            }
+        }
+    }
+
+    .mx_SpaceRoomDirectory_roomTile,
+    .mx_SpaceRoomDirectory_subspace_children {
+        &::before {
+            content: "";
+            position: absolute;
+            background-color: $groupFilterPanel-bg-color;
+            width: 1px;
+            height: 100%;
+            left: 6px;
+            top: 0;
         }
     }
 
@@ -226,4 +274,17 @@ limitations under the License.
             color: $secondary-fg-color;
         }
     }
+
+    > hr {
+        border: none;
+        height: 1px;
+        background-color: rgba(141, 151, 165, 0.2);
+        margin: 20px 0;
+    }
+
+    .mx_SpaceRoomDirectory_createRoom {
+        display: block;
+        margin: 16px auto 0;
+        width: max-content;
+    }
 }
diff --git a/res/img/element-icons/warning-badge.svg b/res/img/element-icons/warning-badge.svg
index ac5991f221..1ae4e40ffe 100644
--- a/res/img/element-icons/warning-badge.svg
+++ b/res/img/element-icons/warning-badge.svg
@@ -1,5 +1,5 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<circle cx="8" cy="8" r="8" fill="#737D8C" style="mix-blend-mode:multiply"/>
-<rect x="7" y="3" width="2" height="6" rx="1" fill="white"/>
-<rect x="7" y="11" width="2" height="2" rx="1" fill="white"/>
+    <circle cx="8" cy="8" r="8" fill="#FF4B55"/>
+    <rect x="7" y="3" width="2" height="6" rx="1" fill="white"/>
+    <rect x="7" y="11" width="2" height="2" rx="1" fill="white"/>
 </svg>
diff --git a/src/components/structures/SpaceRoomDirectory.tsx b/src/components/structures/SpaceRoomDirectory.tsx
index 9ee16558d3..0a53f38238 100644
--- a/src/components/structures/SpaceRoomDirectory.tsx
+++ b/src/components/structures/SpaceRoomDirectory.tsx
@@ -14,27 +14,30 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {useMemo, useRef, useState} from "react";
+import React, {useMemo, useState} from "react";
 import Room from "matrix-js-sdk/src/models/room";
-import MatrixEvent from "matrix-js-sdk/src/models/event";
 import {EventType, RoomType} from "matrix-js-sdk/src/@types/event";
+import classNames from "classnames";
+import {sortBy} from "lodash";
 
 import {MatrixClientPeg} from "../../MatrixClientPeg";
 import dis from "../../dispatcher/dispatcher";
 import {_t} from "../../languageHandler";
 import AccessibleButton from "../views/elements/AccessibleButton";
 import BaseDialog from "../views/dialogs/BaseDialog";
-import FormButton from "../views/elements/FormButton";
+import Spinner from "../views/elements/Spinner";
 import SearchBox from "./SearchBox";
 import RoomAvatar from "../views/avatars/RoomAvatar";
 import RoomName from "../views/elements/RoomName";
 import {useAsyncMemo} from "../../hooks/useAsyncMemo";
-import {shouldShowSpaceSettings} from "../../utils/space";
 import {EnhancedMap} from "../../utils/maps";
 import StyledCheckbox from "../views/elements/StyledCheckbox";
 import AutoHideScrollbar from "./AutoHideScrollbar";
 import BaseAvatar from "../views/avatars/BaseAvatar";
 import {mediaFromMxc} from "../../customisations/Media";
+import InfoTooltip from "../views/elements/InfoTooltip";
+import TextWithTooltip from "../views/elements/TextWithTooltip";
+import {useStateToggle} from "../../hooks/useStateToggle";
 
 interface IProps {
     space: Room;
@@ -72,215 +75,98 @@ export interface ISpaceSummaryEvent {
 }
 /* eslint-enable camelcase */
 
-interface ISubspaceProps {
-    space: ISpaceSummaryRoom;
-    event?: MatrixEvent;
+interface ITileProps {
+    room: ISpaceSummaryRoom;
     editing?: boolean;
-    onPreviewClick?(): void;
-    queueAction?(action: IAction): void;
-    onJoinClick?(): void;
+    suggested?: boolean;
+    selected?: boolean;
+    numChildRooms?: number;
+    hasPermissions?: boolean;
+    onViewRoomClick(autoJoin: boolean): void;
+    onToggleClick?(): void;
 }
 
-const SubSpace: React.FC<ISubspaceProps> = ({
-    space,
+const Tile: React.FC<ITileProps> = ({
+    room,
     editing,
-    event,
-    queueAction,
-    onJoinClick,
-    onPreviewClick,
+    suggested,
+    selected,
+    hasPermissions,
+    onToggleClick,
+    onViewRoomClick,
+    numChildRooms,
     children,
 }) => {
-    const name = space.name || space.canonical_alias || space.aliases?.[0] || _t("Unnamed Space");
+    const name = room.name || room.canonical_alias || room.aliases?.[0]
+        || (room.room_type === RoomType.Space ? _t("Unnamed Space") : _t("Unnamed Room"));
 
-    const evContent = event?.getContent();
-    const [suggested, _setSuggested] = useState(evContent?.suggested);
-    const [removed, _setRemoved] = useState(!evContent?.via);
-
-    const cli = MatrixClientPeg.get();
-    const cliRoom = cli.getRoom(space.room_id);
-    const myMembership = cliRoom?.getMyMembership();
-
-    // TODO DRY code
-    let actions;
-    if (editing && queueAction) {
-        if (event && cli.getRoom(event.getRoomId())?.currentState.maySendStateEvent(event.getType(), cli.getUserId())) {
-            const setSuggested = () => {
-                _setSuggested(v => {
-                    queueAction({
-                        event,
-                        removed,
-                        suggested: !v,
-                    });
-                    return !v;
-                });
-            };
-
-            const setRemoved = () => {
-                _setRemoved(v => {
-                    queueAction({
-                        event,
-                        removed: !v,
-                        suggested,
-                    });
-                    return !v;
-                });
-            };
-
-            if (removed) {
-                actions = <React.Fragment>
-                    <FormButton kind="danger" onClick={setRemoved} label={_t("Undo")} />
-                </React.Fragment>;
-            } else {
-                actions = <React.Fragment>
-                    <FormButton kind="danger" onClick={setRemoved} label={_t("Remove from Space")} />
-                    <StyledCheckbox checked={suggested} onChange={setSuggested} />
-                </React.Fragment>;
-            }
-        } else {
-            actions = <span className="mx_SpaceRoomDirectory_actionsText">
-                { _t("No permissions")}
-            </span>;
-        }
-        // TODO confirm remove from space click behaviour here
-    } else {
-        if (myMembership === "join") {
-            actions = <span className="mx_SpaceRoomDirectory_actionsText">
-                { _t("You're in this space")}
-            </span>;
-        } else if (onJoinClick) {
-            actions = <React.Fragment>
-                <AccessibleButton onClick={onPreviewClick} kind="link">
-                    { _t("Preview") }
-                </AccessibleButton>
-                <FormButton onClick={onJoinClick} label={_t("Join")} />
-            </React.Fragment>
-        }
-    }
-
-    let url: string;
-    if (space.avatar_url) {
-        url = mediaFromMxc(space.avatar_url).getSquareThumbnailHttp(Math.floor(24 * window.devicePixelRatio));
-    }
-
-    return <div className="mx_SpaceRoomDirectory_subspace">
-        <div className="mx_SpaceRoomDirectory_subspace_info">
-            <BaseAvatar name={name} idName={space.room_id} url={url} width={24} height={24} />
-            { name }
-
-            <div className="mx_SpaceRoomDirectory_actions">
-                { actions }
-            </div>
-        </div>
-        <div className="mx_SpaceRoomDirectory_subspace_children">
-            { children }
-        </div>
-    </div>
-};
-
-interface IAction {
-    event: MatrixEvent;
-    suggested: boolean;
-    removed: boolean;
-}
-
-interface IRoomTileProps {
-    room: ISpaceSummaryRoom;
-    event?: MatrixEvent;
-    editing?: boolean;
-    onPreviewClick(): void;
-    queueAction?(action: IAction): void;
-    onJoinClick?(): void;
-}
-
-const RoomTile = ({ room, event, editing, queueAction, onPreviewClick, onJoinClick }: IRoomTileProps) => {
-    const name = room.name || room.canonical_alias || room.aliases?.[0] || _t("Unnamed Room");
-
-    const evContent = event?.getContent();
-    const [suggested, _setSuggested] = useState(evContent?.suggested);
-    const [removed, _setRemoved] = useState(!evContent?.via);
+    const [showChildren, toggleShowChildren] = useStateToggle(true);
 
     const cli = MatrixClientPeg.get();
     const cliRoom = cli.getRoom(room.room_id);
     const myMembership = cliRoom?.getMyMembership();
 
-    let actions;
-    if (editing && queueAction) {
-        if (event && cli.getRoom(event.getRoomId())?.currentState.maySendStateEvent(event.getType(), cli.getUserId())) {
-            const setSuggested = () => {
-                _setSuggested(v => {
-                    queueAction({
-                        event,
-                        removed,
-                        suggested: !v,
-                    });
-                    return !v;
-                });
-            };
+    const onPreviewClick = () => onViewRoomClick(false);
+    const onJoinClick = () => onViewRoomClick(true);
 
-            const setRemoved = () => {
-                _setRemoved(v => {
-                    queueAction({
-                        event,
-                        removed: !v,
-                        suggested,
-                    });
-                    return !v;
-                });
-            };
+    let button;
+    if (myMembership === "join") {
+        button = <AccessibleButton onClick={onPreviewClick} kind="primary_outline">
+            { _t("Open") }
+        </AccessibleButton>;
+    } else if (onJoinClick) {
+        button = <AccessibleButton onClick={onJoinClick} kind="primary">
+            { _t("Join") }
+        </AccessibleButton>;
+    }
 
-            if (removed) {
-                actions = <React.Fragment>
-                    <FormButton kind="danger" onClick={setRemoved} label={_t("Undo")} />
-                </React.Fragment>;
-            } else {
-                actions = <React.Fragment>
-                    <FormButton kind="danger" onClick={setRemoved} label={_t("Remove from Space")} />
-                    <StyledCheckbox checked={suggested} onChange={setSuggested} />
-                </React.Fragment>;
-            }
+    let checkbox;
+    if (onToggleClick) {
+        if (hasPermissions) {
+            checkbox = <StyledCheckbox checked={!!selected} onChange={onToggleClick} />;
         } else {
-            actions = <span className="mx_SpaceRoomDirectory_actionsText">
-                { _t("No permissions")}
-            </span>;
-        }
-        // TODO confirm remove from space click behaviour here
-    } else {
-        if (myMembership === "join") {
-            actions = <span className="mx_SpaceRoomDirectory_actionsText">
-                { _t("You're in this room")}
-            </span>;
-        } else if (onJoinClick) {
-            actions = <React.Fragment>
-                <AccessibleButton onClick={onPreviewClick} kind="link">
-                    { _t("Preview") }
-                </AccessibleButton>
-                <FormButton onClick={onJoinClick} label={_t("Join")} />
-            </React.Fragment>
+            checkbox = <TextWithTooltip
+                tooltip={_t("You don't have permission")}
+                onClick={ev => { ev.stopPropagation() }}
+            >
+                <StyledCheckbox disabled={true} />
+            </TextWithTooltip>;
         }
     }
 
     let url: string;
     if (room.avatar_url) {
-        url = mediaFromMxc(room.avatar_url).getSquareThumbnailHttp(Math.floor(32 * window.devicePixelRatio));
+        url = mediaFromMxc(room.avatar_url).getSquareThumbnailHttp(Math.floor(20 * window.devicePixelRatio));
+    }
+
+    let description = _t("%(count)s members", { count: room.num_joined_members });
+    if (numChildRooms) {
+        description += " · " + _t("%(count)s rooms", { count: numChildRooms });
+    }
+    if (room.topic) {
+        description += " · " + room.topic;
+    }
+
+    let suggestedSection;
+    if (suggested) {
+        suggestedSection = <InfoTooltip tooltip={_t("This room is suggested as a good one to join")}>
+            { _t("Suggested") }
+        </InfoTooltip>;
     }
 
     const content = <React.Fragment>
-        <BaseAvatar name={name} idName={room.room_id} url={url} width={32} height={32} />
+        <BaseAvatar name={name} idName={room.room_id} url={url} width={20} height={20} />
+        <div className="mx_SpaceRoomDirectory_roomTile_name">
+            { name }
+            { suggestedSection }
+        </div>
 
         <div className="mx_SpaceRoomDirectory_roomTile_info">
-            <div className="mx_SpaceRoomDirectory_roomTile_name">
-                { name }
-            </div>
-            <div className="mx_SpaceRoomDirectory_roomTile_topic">
-                { room.topic }
-            </div>
+            { description }
         </div>
-        <div className="mx_SpaceRoomDirectory_roomTile_memberCount">
-            { room.num_joined_members }
-        </div>
-
         <div className="mx_SpaceRoomDirectory_actions">
-            { actions }
+            { button }
+            { checkbox }
         </div>
     </React.Fragment>;
 
@@ -290,9 +176,38 @@ const RoomTile = ({ room, event, editing, queueAction, onPreviewClick, onJoinCli
         </div>
     }
 
-    return <AccessibleButton className="mx_SpaceRoomDirectory_roomTile" onClick={onPreviewClick}>
-        { content }
-    </AccessibleButton>;
+    let childToggle;
+    let childSection;
+    if (children) {
+        // the chevron is purposefully a div rather than a button as it should be ignored for a11y
+        childToggle = <div
+            className={classNames("mx_SpaceRoomDirectory_subspace_toggle", {
+                mx_SpaceRoomDirectory_subspace_toggle_shown: showChildren,
+            })}
+            onClick={ev => {
+                ev.stopPropagation();
+                toggleShowChildren();
+            }}
+        />;
+        if (showChildren) {
+            childSection = <div className="mx_SpaceRoomDirectory_subspace_children">
+                { children }
+            </div>;
+        }
+    }
+
+    return <>
+        <AccessibleButton
+            className={classNames("mx_SpaceRoomDirectory_roomTile", {
+                mx_SpaceRoomDirectory_subspace: room.room_type === RoomType.Space,
+            })}
+            onClick={hasPermissions ? onToggleClick : onPreviewClick}
+        >
+            { content }
+            { childToggle }
+        </AccessibleButton>
+        { childSection }
+    </>;
 };
 
 export const showRoom = (room: ISpaceSummaryRoom, viaServers?: string[], autoJoin = false) => {
@@ -325,88 +240,77 @@ export const showRoom = (room: ISpaceSummaryRoom, viaServers?: string[], autoJoi
 interface IHierarchyLevelProps {
     spaceId: string;
     rooms: Map<string, ISpaceSummaryRoom>;
-    editing?: boolean;
-    relations: EnhancedMap<string, string[]>;
+    relations: EnhancedMap<string, Map<string, ISpaceSummaryEvent>>;
     parents: Set<string>;
-    queueAction?(action: IAction): void;
-    onPreviewClick(roomId: string): void;
-    onRemoveFromSpaceClick?(roomId: string): void;
-    onJoinClick?(roomId: string): void;
+    selectedMap?: Map<string, Set<string>>;
+    onViewRoomClick(roomId: string, autoJoin: boolean): void;
+    onToggleClick?(parentId: string, childId: string): void;
 }
 
 export const HierarchyLevel = ({
     spaceId,
     rooms,
-    editing,
     relations,
     parents,
-    onPreviewClick,
-    onJoinClick,
-    queueAction,
+    selectedMap,
+    onViewRoomClick,
+    onToggleClick,
 }: IHierarchyLevelProps) => {
     const cli = MatrixClientPeg.get();
     const space = cli.getRoom(spaceId);
-    // TODO respect order
-    const [subspaces, childRooms] = relations.get(spaceId)?.reduce((result, roomId: string) => {
-        if (!rooms.has(roomId)) return result; // TODO wat
+    const hasPermissions = space?.currentState.maySendStateEvent(EventType.SpaceChild, cli.getUserId())
+
+    const sortedChildren = sortBy([...relations.get(spaceId)?.values()], ev => ev.content.order || null);
+    const [subspaces, childRooms] = sortedChildren.reduce((result, ev: ISpaceSummaryEvent) => {
+        const roomId = ev.state_key;
+        if (!rooms.has(roomId)) return result;
         result[rooms.get(roomId).room_type === RoomType.Space ? 0 : 1].push(roomId);
         return result;
     }, [[], []]) || [[], []];
 
-    // Don't render this subspace if it has no rooms we can show
-    // TODO this is broken - as a space may have subspaces we still need to show
-    // if (!childRooms.length) return null;
-
-    const userId = cli.getUserId();
-
     const newParents = new Set(parents).add(spaceId);
     return <React.Fragment>
         {
             childRooms.map(roomId => (
-                <RoomTile
+                <Tile
                     key={roomId}
                     room={rooms.get(roomId)}
-                    event={space?.currentState.maySendStateEvent(EventType.SpaceChild, userId)
-                        ? space?.currentState.getStateEvents(EventType.SpaceChild, roomId)
-                        : undefined}
-                    editing={editing}
-                    queueAction={queueAction}
-                    onPreviewClick={() => {
-                        onPreviewClick(roomId);
+                    suggested={relations.get(spaceId)?.get(roomId)?.content.suggested}
+                    selected={selectedMap?.get(spaceId)?.has(roomId)}
+                    onViewRoomClick={(autoJoin) => {
+                        onViewRoomClick(roomId, autoJoin);
                     }}
-                    onJoinClick={onJoinClick ? () => {
-                        onJoinClick(roomId);
-                    } : undefined}
+                    hasPermissions={hasPermissions}
+                    onToggleClick={onToggleClick ? () => onToggleClick(spaceId, roomId) : undefined}
                 />
             ))
         }
 
         {
             subspaces.filter(roomId => !newParents.has(roomId)).map(roomId => (
-                <SubSpace
+                <Tile
                     key={roomId}
-                    space={rooms.get(roomId)}
-                    event={space?.currentState.getStateEvents(EventType.SpaceChild, roomId)}
-                    editing={editing}
-                    queueAction={queueAction}
-                    onPreviewClick={() => {
-                        onPreviewClick(roomId);
-                    }}
-                    onJoinClick={() => {
-                        onJoinClick(roomId);
+                    room={rooms.get(roomId)}
+                    numChildRooms={Array.from(relations.get(roomId)?.values() || [])
+                        .filter(ev => rooms.get(ev.state_key)?.room_type !== RoomType.Space).length}
+                    suggested={relations.get(spaceId)?.get(roomId)?.content.suggested}
+                    selected={selectedMap?.get(spaceId)?.has(roomId)}
+                    onViewRoomClick={(autoJoin) => {
+                        onViewRoomClick(roomId, autoJoin);
                     }}
+                    hasPermissions={hasPermissions}
+                    onToggleClick={onToggleClick ? () => onToggleClick(spaceId, roomId) : undefined}
                 >
                     <HierarchyLevel
                         spaceId={roomId}
                         rooms={rooms}
-                        editing={editing}
                         relations={relations}
                         parents={newParents}
-                        onPreviewClick={onPreviewClick}
-                        onJoinClick={onJoinClick}
-                        queueAction={queueAction}
+                        selectedMap={selectedMap}
+                        onViewRoomClick={onViewRoomClick}
+                        onToggleClick={onToggleClick}
                     />
-                </SubSpace>
+                </Tile>
             ))
         }
     </React.Fragment>
@@ -415,8 +319,8 @@ export const HierarchyLevel = ({
 const SpaceRoomDirectory: React.FC<IProps> = ({ space, initialText = "", onFinished }) => {
     // TODO pagination
     const cli = MatrixClientPeg.get();
+    const userId = cli.getUserId();
     const [query, setQuery] = useState(initialText);
-    const [isEditing, setIsEditing] = useState(false);
 
     const onCreateRoomClick = () => {
         dis.dispatch({
@@ -426,51 +330,19 @@ const SpaceRoomDirectory: React.FC<IProps> = ({ space, initialText = "", onFinis
         onFinished();
     };
 
-    // stored within a ref as we don't need to re-render when it changes
-    const pendingActions = useRef(new Map<string, IAction>());
+    const [selected, setSelected] = useState(new Map<string, Set<string>>()); // Map<parentId, Set<childId>>
 
-    let adminButton;
-    if (shouldShowSpaceSettings(cli, space)) { // TODO this is an imperfect test
-        const onManageButtonClicked = () => {
-            setIsEditing(true);
-        };
-
-        const onSaveButtonClicked = () => {
-            // TODO setBusy
-            pendingActions.current.forEach(({event, suggested, removed}) => {
-                const content = {
-                    ...event.getContent(),
-                    suggested,
-                };
-
-                if (removed) {
-                    delete content["via"];
-                }
-
-                cli.sendStateEvent(event.getRoomId(), event.getType(), content, event.getStateKey());
-            });
-            setIsEditing(false);
-        };
-
-        if (isEditing) {
-            adminButton = <React.Fragment>
-                <FormButton label={_t("Save changes")} onClick={onSaveButtonClicked} />
-                <span>{ _t("Promoted to users") }</span>
-            </React.Fragment>;
-        } else {
-            adminButton = <FormButton label={_t("Manage rooms")} onClick={onManageButtonClicked} />;
-        }
-    }
-
-    const [rooms, relations, viaMap] = useAsyncMemo(async () => {
+    const [rooms, parentChildMap, childParentMap, viaMap] = useAsyncMemo(async () => {
         try {
             const data = await cli.getSpaceSummary(space.roomId);
 
-            const parentChildRelations = new EnhancedMap<string, string[]>();
+            const parentChildRelations = new EnhancedMap<string, Map<string, ISpaceSummaryEvent>>();
+            const childParentRelations = new EnhancedMap<string, Set<string>>();
             const viaMap = new EnhancedMap<string, Set<string>>();
             data.events.map((ev: ISpaceSummaryEvent) => {
                 if (ev.type === EventType.SpaceChild) {
-                    parentChildRelations.getOrCreate(ev.room_id, []).push(ev.state_key);
+                    parentChildRelations.getOrCreate(ev.room_id, new Map()).set(ev.state_key, ev);
+                    childParentRelations.getOrCreate(ev.state_key, new Set()).add(ev.room_id);
                 }
                 if (Array.isArray(ev.content["via"])) {
                     const set = viaMap.getOrCreate(ev.state_key, new Set());
@@ -478,7 +350,7 @@ const SpaceRoomDirectory: React.FC<IProps> = ({ space, initialText = "", onFinis
                 }
             });
 
-            return [data.rooms, parentChildRelations, viaMap];
+            return [data.rooms as ISpaceSummaryRoom[], parentChildRelations, childParentRelations, viaMap];
         } catch (e) {
             console.error(e); // TODO
         }
@@ -488,54 +360,204 @@ const SpaceRoomDirectory: React.FC<IProps> = ({ space, initialText = "", onFinis
 
     const roomsMap = useMemo(() => {
         if (!rooms) return null;
-        const lcQuery = query.toLowerCase();
+        const lcQuery = query.toLowerCase().trim();
 
-        const filteredRooms = rooms.filter(r => {
-            return r.room_type === RoomType.Space // always include spaces to allow filtering of sub-space rooms
-                || r.name?.toLowerCase().includes(lcQuery)
-                || r.topic?.toLowerCase().includes(lcQuery);
+        const roomsMap = new Map<string, ISpaceSummaryRoom>(rooms.map(r => [r.room_id, r]));
+        if (!lcQuery) return roomsMap;
+
+        const directMatches = rooms.filter(r => {
+            return r.name?.toLowerCase().includes(lcQuery) || r.topic?.toLowerCase().includes(lcQuery);
         });
 
-        return new Map<string, ISpaceSummaryRoom>(filteredRooms.map(r => [r.room_id, r]));
-        // const root = rooms.get(space.roomId);
-    }, [rooms, query]);
+        // Walk back up the tree to find all parents of the direct matches to show their place in the hierarchy
+        const visited = new Set<string>();
+        const queue = [...directMatches.map(r => r.room_id)];
+        while (queue.length) {
+            const roomId = queue.pop();
+            visited.add(roomId);
+            childParentMap.get(roomId)?.forEach(parentId => {
+                if (!visited.has(parentId)) {
+                    queue.push(parentId);
+                }
+            });
+        }
+
+        // Remove any mappings for rooms which were not visited in the walk
+        Array.from(roomsMap.keys()).forEach(roomId => {
+            if (!visited.has(roomId)) {
+                roomsMap.delete(roomId);
+            }
+        });
+        return roomsMap;
+    }, [rooms, childParentMap, query]);
 
     const title = <React.Fragment>
-        <RoomAvatar room={space} height={40} width={40} />
+        <RoomAvatar room={space} height={32} width={32} />
         <div>
             <h1>{ _t("Explore rooms") }</h1>
             <div><RoomName room={space} /></div>
         </div>
     </React.Fragment>;
+
     const explanation =
-        _t("If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.", null,
+        _t("If you can't find the room you're looking for, ask for an invite or <a>create a new room</a>.", null,
             {a: sub => {
                 return <AccessibleButton kind="link" onClick={onCreateRoomClick}>{sub}</AccessibleButton>;
             }},
         );
 
+    const [error, setError] = useState("");
+    const [removing, setRemoving] = useState(false);
+    const [saving, setSaving] = useState(false);
+
     let content;
     if (roomsMap) {
-        content = <AutoHideScrollbar className="mx_SpaceRoomDirectory_list">
-            <HierarchyLevel
-                spaceId={space.roomId}
-                rooms={roomsMap}
-                editing={isEditing}
-                relations={relations}
-                parents={new Set()}
-                queueAction={action => {
-                    pendingActions.current.set(action.event.room_id, action);
-                }}
-                onPreviewClick={roomId => {
-                    showRoom(roomsMap.get(roomId), Array.from(viaMap.get(roomId) || []), false);
-                    onFinished();
-                }}
-                onJoinClick={(roomId) => {
-                    showRoom(roomsMap.get(roomId), Array.from(viaMap.get(roomId) || []), true);
-                    onFinished();
-                }}
-            />
-        </AutoHideScrollbar>;
+        const numRooms = Array.from(roomsMap.values()).filter(r => r.room_type !== RoomType.Space).length;
+        const numSpaces = roomsMap.size - numRooms - 1; // -1 at the end to exclude the space we are looking at
+
+        let countsStr;
+        if (numSpaces > 1) {
+            countsStr = _t("%(count)s rooms and %(numSpaces)s spaces", { count: numRooms, numSpaces });
+        } else if (numSpaces > 0) {
+            countsStr = _t("%(count)s rooms and 1 space", { count: numRooms, numSpaces });
+        } else {
+            countsStr = _t("%(count)s rooms", { count: numRooms, numSpaces });
+        }
+
+        let editSection;
+        if (space.getMyMembership() === "join" && space.currentState.maySendStateEvent(EventType.SpaceChild, userId)) {
+            const selectedRelations = Array.from(selected.keys()).flatMap(parentId => {
+                return [...selected.get(parentId).values()].map(childId => [parentId, childId]) as [string, string][];
+            });
+
+            let buttons;
+            if (selectedRelations.length) {
+                const selectionAllSuggested = selectedRelations.every(([parentId, childId]) => {
+                    return parentChildMap.get(parentId)?.get(childId)?.content.suggested;
+                });
+
+                const disabled = removing || saving;
+
+                buttons = <>
+                    <AccessibleButton
+                        onClick={async () => {
+                            setRemoving(true);
+                            try {
+                                for (const [parentId, childId] of selectedRelations) {
+                                    await cli.sendStateEvent(parentId, EventType.SpaceChild, {}, childId);
+                                    parentChildMap.get(parentId).get(childId).content = {};
+                                    parentChildMap.set(parentId, new Map(parentChildMap.get(parentId)));
+                                }
+                            } catch (e) {
+                                setError(_t("Failed to remove some rooms. Try again later"));
+                            }
+                            setRemoving(false);
+                        }}
+                        kind="danger_outline"
+                        disabled={disabled}
+                    >
+                        { removing ? _t("Removing...") : _t("Remove") }
+                    </AccessibleButton>
+                    <AccessibleButton
+                        onClick={async () => {
+                            setSaving(true);
+                            try {
+                                for (const [parentId, childId] of selectedRelations) {
+                                    const suggested = !selectionAllSuggested;
+                                    const existingContent = parentChildMap.get(parentId)?.get(childId)?.content;
+                                    if (!existingContent || existingContent.suggested === suggested) continue;
+
+                                    const content = {
+                                        ...existingContent,
+                                        suggested: !selectionAllSuggested,
+                                    };
+
+                                    await cli.sendStateEvent(parentId, EventType.SpaceChild, content, childId);
+
+                                    parentChildMap.get(parentId).get(childId).content = content;
+                                    parentChildMap.set(parentId, new Map(parentChildMap.get(parentId)));
+                                }
+                            } catch (e) {
+                                setError("Failed to update some suggestions. Try again later");
+                            }
+                            setSaving(false);
+                        }}
+                        kind="primary_outline"
+                        disabled={disabled}
+                    >
+                        { saving
+                            ? _t("Saving...")
+                            : (selectionAllSuggested ? _t("Mark as not suggested") : _t("Mark as suggested"))
+                        }
+                    </AccessibleButton>
+                </>;
+            }
+
+            editSection = <span>
+                { buttons }
+            </span>;
+        }
+
+        let results;
+        if (roomsMap.size) {
+            results = <>
+                <HierarchyLevel
+                    spaceId={space.roomId}
+                    rooms={roomsMap}
+                    relations={parentChildMap}
+                    parents={new Set()}
+                    selectedMap={selected}
+                    onToggleClick={(parentId, childId) => {
+                        setError("");
+                        if (!selected.has(parentId)) {
+                            setSelected(new Map(selected.set(parentId, new Set([childId]))));
+                            return;
+                        }
+
+                        const parentSet = selected.get(parentId);
+                        if (!parentSet.has(childId)) {
+                            setSelected(new Map(selected.set(parentId, new Set([...parentSet, childId]))));
+                            return;
+                        }
+
+                        parentSet.delete(childId);
+                        setSelected(new Map(selected.set(parentId, new Set(parentSet))));
+                    }}
+                    onViewRoomClick={(roomId, autoJoin) => {
+                        showRoom(roomsMap.get(roomId), Array.from(viaMap.get(roomId) || []), autoJoin);
+                        onFinished();
+                    }}
+                />
+                <hr />
+            </>;
+        } else {
+            results = <div className="mx_SpaceRoomDirectory_noResults">
+                <h3>{ _t("No results found") }</h3>
+                <div>{ _t("You may want to try a different search or check for typos.") }</div>
+            </div>;
+        }
+
+        content = <>
+            <div className="mx_SpaceRoomDirectory_listHeader">
+                { countsStr }
+                { editSection }
+            </div>
+            { error && <div className="mx_SpaceRoomDirectory_error">
+                { error }
+            </div> }
+            <AutoHideScrollbar className="mx_SpaceRoomDirectory_list">
+                { results }
+                <AccessibleButton
+                    onClick={onCreateRoomClick}
+                    kind="primary"
+                    className="mx_SpaceRoomDirectory_createRoom"
+                >
+                    { _t("Create room") }
+                </AccessibleButton>
+            </AutoHideScrollbar>
+        </>;
+    } else {
+        content = <Spinner />;
     }
 
     // TODO loading state/error state
@@ -546,13 +568,10 @@ const SpaceRoomDirectory: React.FC<IProps> = ({ space, initialText = "", onFinis
 
                 <SearchBox
                     className="mx_textinput_icon mx_textinput_search"
-                    placeholder={ _t("Find a room...") }
+                    placeholder={ _t("Search names and description") }
                     onSearch={setQuery}
                 />
 
-                <div className="mx_SpaceRoomDirectory_listHeader">
-                    { adminButton }
-                </div>
                 { content }
             </div>
         </BaseDialog>
diff --git a/src/components/structures/SpaceRoomView.tsx b/src/components/structures/SpaceRoomView.tsx
index 0b0f2a2ac9..2b4168a983 100644
--- a/src/components/structures/SpaceRoomView.tsx
+++ b/src/components/structures/SpaceRoomView.tsx
@@ -230,10 +230,10 @@ const SpaceLanding = ({ space }) => {
         try {
             const data = await cli.getSpaceSummary(space.roomId, undefined, myMembership !== "join");
 
-            const parentChildRelations = new EnhancedMap<string, string[]>();
+            const parentChildRelations = new EnhancedMap<string, Map<string, ISpaceSummaryEvent>>();
             data.events.map((ev: ISpaceSummaryEvent) => {
                 if (ev.type === EventType.SpaceChild) {
-                    parentChildRelations.getOrCreate(ev.room_id, []).push(ev.state_key);
+                    parentChildRelations.getOrCreate(ev.room_id, new Map()).set(ev.state_key, ev);
                 }
             });
 
@@ -257,11 +257,10 @@ const SpaceLanding = ({ space }) => {
             <HierarchyLevel
                 spaceId={space.roomId}
                 rooms={roomsMap}
-                editing={false}
                 relations={relations}
                 parents={new Set()}
-                onPreviewClick={roomId => {
-                    showRoom(roomsMap.get(roomId), [], false); // TODO
+                onViewRoomClick={(roomId, autoJoin) => {
+                    showRoom(roomsMap.get(roomId), [], autoJoin);
                 }}
             />
         </AutoHideScrollbar>;
diff --git a/src/components/views/elements/TextWithTooltip.js b/src/components/views/elements/TextWithTooltip.js
index e4ad234ae2..0bd491768c 100644
--- a/src/components/views/elements/TextWithTooltip.js
+++ b/src/components/views/elements/TextWithTooltip.js
@@ -46,12 +46,14 @@ export default class TextWithTooltip extends React.Component {
     render() {
         const Tooltip = sdk.getComponent("elements.Tooltip");
 
+        const {class: className, children, tooltip, tooltipClass, ...props} = this.props;
+
         return (
-            <span onMouseOver={this.onMouseOver} onMouseLeave={this.onMouseLeave} className={this.props.class}>
-                {this.props.children}
+            <span {...props} onMouseOver={this.onMouseOver} onMouseLeave={this.onMouseLeave} className={className}>
+                {children}
                 {this.state.hover && <Tooltip
-                    label={this.props.tooltip}
-                    tooltipClassName={this.props.tooltipClass}
+                    label={tooltip}
+                    tooltipClassName={tooltipClass}
                     className={"mx_TextWithTooltip_tooltip"} /> }
             </span>
         );
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 07d292a0e7..e4d197470d 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2603,20 +2603,30 @@
     "Drop file here to upload": "Drop file here to upload",
     "You have %(count)s unread notifications in a prior version of this room.|other": "You have %(count)s unread notifications in a prior version of this room.",
     "You have %(count)s unread notifications in a prior version of this room.|one": "You have %(count)s unread notification in a prior version of this room.",
-    "Undo": "Undo",
-    "Remove from Space": "Remove from Space",
-    "No permissions": "No permissions",
-    "You're in this space": "You're in this space",
-    "You're in this room": "You're in this room",
-    "Save changes": "Save changes",
-    "Promoted to users": "Promoted to users",
-    "Manage rooms": "Manage rooms",
-    "Find a room...": "Find a room...",
+    "Open": "Open",
+    "You don't have permission": "You don't have permission",
+    "%(count)s members|other": "%(count)s members",
+    "%(count)s members|one": "%(count)s member",
+    "%(count)s rooms|other": "%(count)s rooms",
+    "%(count)s rooms|one": "%(count)s room",
+    "This room is suggested as a good one to join": "This room is suggested as a good one to join",
+    "Suggested": "Suggested",
+    "If you can't find the room you're looking for, ask for an invite or <a>create a new room</a>.": "If you can't find the room you're looking for, ask for an invite or <a>create a new room</a>.",
+    "%(count)s rooms and %(numSpaces)s spaces|other": "%(count)s rooms and %(numSpaces)s spaces",
+    "%(count)s rooms and %(numSpaces)s spaces|one": "%(count)s room and %(numSpaces)s spaces",
+    "%(count)s rooms and 1 space|other": "%(count)s rooms and 1 space",
+    "%(count)s rooms and 1 space|one": "%(count)s room and 1 space",
+    "Failed to remove some rooms. Try again later": "Failed to remove some rooms. Try again later",
+    "Removing...": "Removing...",
+    "Mark as not suggested": "Mark as not suggested",
+    "Mark as suggested": "Mark as suggested",
+    "No results found": "No results found",
+    "You may want to try a different search or check for typos.": "You may want to try a different search or check for typos.",
+    "Create room": "Create room",
+    "Search names and description": "Search names and description",
     "<inviter/> invites you": "<inviter/> invites you",
     "Public space": "Public space",
     "Private space": "Private space",
-    "%(count)s members|other": "%(count)s members",
-    "%(count)s members|one": "%(count)s member",
     "Add existing rooms & spaces": "Add existing rooms & spaces",
     "Default Rooms": "Default Rooms",
     "Your server does not support showing space hierarchies.": "Your server does not support showing space hierarchies.",

From 90d87122bc45d3082d4322f8f06085f71377086b Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 16 Mar 2021 11:39:06 +0000
Subject: [PATCH 354/420] Tweak copy on space creation flows

---
 src/components/structures/SpaceRoomView.tsx     | 14 ++++++++++----
 src/components/views/spaces/SpaceCreateMenu.tsx |  4 ++--
 src/i18n/strings/en_EN.json                     | 10 +++++-----
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/components/structures/SpaceRoomView.tsx b/src/components/structures/SpaceRoomView.tsx
index 0b0f2a2ac9..17ab75e707 100644
--- a/src/components/structures/SpaceRoomView.tsx
+++ b/src/components/structures/SpaceRoomView.tsx
@@ -369,7 +369,7 @@ const SpaceSetupFirstRooms = ({ space, title, description, onFinished }) => {
     let buttonLabel = _t("Skip for now");
     if (roomNames.some(name => name.trim())) {
         onClick = onNextClick;
-        buttonLabel = busy ? _t("Creating rooms...") : _t("Next")
+        buttonLabel = busy ? _t("Creating rooms...") : _t("Continue")
     }
 
     return <div>
@@ -391,8 +391,14 @@ const SpaceSetupFirstRooms = ({ space, title, description, onFinished }) => {
 
 const SpaceSetupPublicShare = ({ space, onFinished }) => {
     return <div className="mx_SpaceRoomView_publicShare">
-        <h1>{ _t("Share your public space") }</h1>
-        <div className="mx_SpacePublicShare_description">{ _t("At the moment only you can see it.") }</div>
+        <h1>{ _t("Invite people") }</h1>
+        <div className="mx_SpaceRoomView_description">
+            {
+                _t("It's just you at the moment.")
+            } {
+                _t("%(spaceName)s will be even better with others", { spaceName: space.name })
+            }
+        </div>
 
         <SpacePublicShare space={space} onFinished={onFinished} />
 
@@ -610,7 +616,7 @@ export default class SpaceRoomView extends React.PureComponent<IProps, IState> {
                 return <SpaceSetupFirstRooms
                     space={this.props.space}
                     title={_t("What are some things you want to discuss?")}
-                    description={_t("We'll create rooms for each topic.")}
+                    description={_t("We'll create a room for each of them. You can add more later too.")}
                     onFinished={() => this.setState({ phase: Phase.PublicShare })}
                 />;
             case Phase.PublicShare:
diff --git a/src/components/views/spaces/SpaceCreateMenu.tsx b/src/components/views/spaces/SpaceCreateMenu.tsx
index 88098d1b66..ca5b25f128 100644
--- a/src/components/views/spaces/SpaceCreateMenu.tsx
+++ b/src/components/views/spaces/SpaceCreateMenu.tsx
@@ -140,9 +140,9 @@ const SpaceCreateMenu = ({ onFinished }) => {
             </h2>
             <p>
                 {
-                    _t("Give it a photo, name and description to help you identify it.")
+                    _t("Add some details to help people recognise it.")
                 } {
-                    _t("You can change these at any point.")
+                    _t("You can change these anytime.")
                 }
             </p>
 
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 07d292a0e7..e3ccc1794d 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -998,8 +998,8 @@
     "Go back": "Go back",
     "Your public space": "Your public space",
     "Your private space": "Your private space",
-    "Give it a photo, name and description to help you identify it.": "Give it a photo, name and description to help you identify it.",
-    "You can change these at any point.": "You can change these at any point.",
+    "Add some details to help people recognise it.": "Add some details to help people recognise it.",
+    "You can change these anytime.": "You can change these anytime.",
     "Creating...": "Creating...",
     "Create": "Create",
     "Expand space panel": "Expand space panel",
@@ -2629,8 +2629,8 @@
     "Failed to create initial space rooms": "Failed to create initial space rooms",
     "Skip for now": "Skip for now",
     "Creating rooms...": "Creating rooms...",
-    "At the moment only you can see it.": "At the moment only you can see it.",
-    "Finish": "Finish",
+    "It's just you at the moment.": "It's just you at the moment.",
+    "%(spaceName)s will be even better with others": "%(spaceName)s will be even better with others",
     "Who are you working with?": "Who are you working with?",
     "Ensure the right people have access to the space.": "Ensure the right people have access to the space.",
     "Just Me": "Just Me",
@@ -2642,7 +2642,7 @@
     "Invite by username": "Invite by username",
     "Inviting...": "Inviting...",
     "What are some things you want to discuss?": "What are some things you want to discuss?",
-    "We'll create rooms for each topic.": "We'll create rooms for each topic.",
+    "We'll create a room for each of them. You can add more later too.": "We'll create a room for each of them. You can add more later too.",
     "What projects are you working on?": "What projects are you working on?",
     "We'll create rooms for each of them. You can add existing rooms after setup.": "We'll create rooms for each of them. You can add existing rooms after setup.",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.",

From c6f6d24b32b22fc1a77fc306a117e7209438ce76 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 16 Mar 2021 14:18:45 +0000
Subject: [PATCH 355/420] Iterate space creation and previews

---
 src/components/structures/SpaceRoomView.tsx | 87 ++++++++++++++++++---
 src/i18n/strings/en_EN.json                 |  1 +
 src/stores/SpaceStore.tsx                   | 35 ++++++---
 3 files changed, 100 insertions(+), 23 deletions(-)

diff --git a/src/components/structures/SpaceRoomView.tsx b/src/components/structures/SpaceRoomView.tsx
index 17ab75e707..cfa261bb9b 100644
--- a/src/components/structures/SpaceRoomView.tsx
+++ b/src/components/structures/SpaceRoomView.tsx
@@ -17,6 +17,7 @@ limitations under the License.
 import React, {RefObject, useContext, useRef, useState} from "react";
 import {EventType, RoomType} from "matrix-js-sdk/src/@types/event";
 import {Room} from "matrix-js-sdk/src/models/room";
+import {EventSubscription} from "fbemitter";
 
 import MatrixClientContext from "../../contexts/MatrixClientContext";
 import RoomAvatar from "../views/avatars/RoomAvatar";
@@ -42,7 +43,6 @@ import ErrorBoundary from "../views/elements/ErrorBoundary";
 import {ActionPayload} from "../../dispatcher/payloads";
 import RightPanel from "./RightPanel";
 import RightPanelStore from "../../stores/RightPanelStore";
-import {EventSubscription} from "fbemitter";
 import {RightPanelPhases} from "../../stores/RightPanelStorePhases";
 import {SetRightPanelPhasePayload} from "../../dispatcher/payloads/SetRightPanelPhasePayload";
 import {useStateArray} from "../../hooks/useStateArray";
@@ -54,6 +54,7 @@ import {EnhancedMap} from "../../utils/maps";
 import AutoHideScrollbar from "./AutoHideScrollbar";
 import MemberAvatar from "../views/avatars/MemberAvatar";
 import {useStateToggle} from "../../hooks/useStateToggle";
+import SpaceStore from "../../stores/SpaceStore";
 
 interface IProps {
     space: Room;
@@ -66,6 +67,7 @@ interface IProps {
 interface IState {
     phase: Phase;
     showRightPanel: boolean;
+    myMembership: string;
 }
 
 enum Phase {
@@ -98,6 +100,8 @@ const SpacePreview = ({ space, onJoinButtonClicked, onRejectButtonClicked }) =>
     const cli = useContext(MatrixClientContext);
     const myMembership = useMyRoomMembership(space);
 
+    const [busy, setBusy] = useState(false);
+
     let inviterSection;
     let joinButtons;
     if (myMembership === "invite") {
@@ -121,11 +125,35 @@ const SpacePreview = ({ space, onJoinButtonClicked, onRejectButtonClicked }) =>
         }
 
         joinButtons = <>
-            <FormButton label={_t("Reject")} kind="secondary" onClick={onRejectButtonClicked} />
-            <FormButton label={_t("Accept")} onClick={onJoinButtonClicked} />
+            <FormButton
+                label={_t("Reject")}
+                kind="secondary"
+                onClick={() => {
+                    setBusy(true);
+                    onRejectButtonClicked();
+                }} />
+            <FormButton
+                label={_t("Accept")}
+                onClick={() => {
+                    setBusy(true);
+                    onJoinButtonClicked();
+                }}
+            />
         </>;
     } else {
-        joinButtons = <FormButton label={_t("Join")} onClick={onJoinButtonClicked} />
+        joinButtons = (
+            <FormButton
+                label={_t("Join")}
+                onClick={() => {
+                    setBusy(true);
+                    onJoinButtonClicked();
+                }}
+            />
+        )
+    }
+
+    if (busy) {
+        joinButtons = <InlineSpinner />;
     }
 
     let visibilitySection;
@@ -403,7 +431,7 @@ const SpaceSetupPublicShare = ({ space, onFinished }) => {
         <SpacePublicShare space={space} onFinished={onFinished} />
 
         <div className="mx_SpaceRoomView_buttons">
-            <FormButton label={_t("Finish")} onClick={onFinished} />
+            <FormButton label={_t("Go to my first room")} onClick={onFinished} />
         </div>
     </div>;
 };
@@ -553,17 +581,26 @@ export default class SpaceRoomView extends React.PureComponent<IProps, IState> {
         this.state = {
             phase,
             showRightPanel: RightPanelStore.getSharedInstance().isOpenForRoom,
+            myMembership: this.props.space.getMyMembership(),
         };
 
         this.dispatcherRef = defaultDispatcher.register(this.onAction);
         this.rightPanelStoreToken = RightPanelStore.getSharedInstance().addListener(this.onRightPanelStoreUpdate);
+        this.context.on("Room.myMembership", this.onMyMembership);
     }
 
     componentWillUnmount() {
         defaultDispatcher.unregister(this.dispatcherRef);
         this.rightPanelStoreToken.remove();
+        this.context.off("Room.myMembership", this.onMyMembership);
     }
 
+    private onMyMembership = (room: Room, myMembership: string) => {
+        if (room.roomId === this.props.space.roomId) {
+            this.setState({ myMembership });
+        }
+    };
+
     private onRightPanelStoreUpdate = () => {
         this.setState({
             showRightPanel: RightPanelStore.getSharedInstance().isOpenForRoom,
@@ -600,10 +637,43 @@ export default class SpaceRoomView extends React.PureComponent<IProps, IState> {
         }
     };
 
+    private goToFirstRoom = async () => {
+        const childRooms = SpaceStore.instance.getChildRooms(this.props.space.roomId);
+        if (childRooms.length) {
+            const room = childRooms[0];
+            defaultDispatcher.dispatch({
+                action: "view_room",
+                room_id: room.roomId,
+            });
+            return;
+        }
+
+        let suggestedRooms = SpaceStore.instance.suggestedRooms;
+        if (SpaceStore.instance.activeSpace !== this.props.space) {
+            // the space store has the suggested rooms loaded for a different space, fetch the right ones
+            suggestedRooms = (await SpaceStore.instance.fetchSuggestedRooms(this.props.space, 1)).rooms;
+        }
+
+        if (suggestedRooms.length) {
+            const room = suggestedRooms[0];
+            defaultDispatcher.dispatch({
+                action: "view_room",
+                room_id: room.room_id,
+                oobData: {
+                    avatarUrl: room.avatar_url,
+                    name: room.name || room.canonical_alias || room.aliases.pop() || _t("Empty room"),
+                },
+            });
+            return;
+        }
+
+        this.setState({ phase: Phase.Landing });
+    };
+
     private renderBody() {
         switch (this.state.phase) {
             case Phase.Landing:
-                if (this.props.space.getMyMembership() === "join") {
+                if (this.state.myMembership === "join") {
                     return <SpaceLanding space={this.props.space} />;
                 } else {
                     return <SpacePreview
@@ -620,10 +690,7 @@ export default class SpaceRoomView extends React.PureComponent<IProps, IState> {
                     onFinished={() => this.setState({ phase: Phase.PublicShare })}
                 />;
             case Phase.PublicShare:
-                return <SpaceSetupPublicShare
-                    space={this.props.space}
-                    onFinished={() => this.setState({ phase: Phase.Landing })}
-                />;
+                return <SpaceSetupPublicShare space={this.props.space} onFinished={this.goToFirstRoom} />;
 
             case Phase.PrivateScope:
                 return <SpaceSetupPrivateScope
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index e3ccc1794d..4be6e06459 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2631,6 +2631,7 @@
     "Creating rooms...": "Creating rooms...",
     "It's just you at the moment.": "It's just you at the moment.",
     "%(spaceName)s will be even better with others": "%(spaceName)s will be even better with others",
+    "Go to my first room": "Go to my first room",
     "Who are you working with?": "Who are you working with?",
     "Ensure the right people have access to the space.": "Ensure the right people have access to the space.",
     "Just Me": "Just Me",
diff --git a/src/stores/SpaceStore.tsx b/src/stores/SpaceStore.tsx
index d1abc68f4e..a329ee78e1 100644
--- a/src/stores/SpaceStore.tsx
+++ b/src/stores/SpaceStore.tsx
@@ -118,23 +118,32 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
         }
 
         if (space) {
-            try {
-                const data: {
-                    rooms: ISpaceSummaryRoom[];
-                    events: ISpaceSummaryEvent[];
-                } = await this.matrixClient.getSpaceSummary(space.roomId, 0, true, false, MAX_SUGGESTED_ROOMS);
-                if (this._activeSpace === space) {
-                    this._suggestedRooms = data.rooms.filter(roomInfo => {
-                        return roomInfo.room_type !== RoomType.Space && !this.matrixClient.getRoom(roomInfo.room_id);
-                    });
-                    this.emit(SUGGESTED_ROOMS, this._suggestedRooms);
-                }
-            } catch (e) {
-                console.error(e);
+            const data = await this.fetchSuggestedRooms(space);
+            if (this._activeSpace === space) {
+                this._suggestedRooms = data.rooms.filter(roomInfo => {
+                    return roomInfo.room_type !== RoomType.Space && !this.matrixClient.getRoom(roomInfo.room_id);
+                });
+                this.emit(SUGGESTED_ROOMS, this._suggestedRooms);
             }
         }
     }
 
+    public fetchSuggestedRooms = async (space: Room, limit = MAX_SUGGESTED_ROOMS) => {
+        try {
+            const data: {
+                rooms: ISpaceSummaryRoom[];
+                events: ISpaceSummaryEvent[];
+            } = await this.matrixClient.getSpaceSummary(space.roomId, 0, true, false, limit);
+            return data;
+        } catch (e) {
+            console.error(e);
+        }
+        return {
+            rooms: [],
+            events: [],
+        };
+    };
+
     public addRoomToSpace(space: Room, roomId: string, via: string[], suggested = false, autoJoin = false) {
         return this.matrixClient.sendStateEvent(space.roomId, EventType.SpaceChild, {
             via,

From 31ce19373be030ec2869195545828eadb567cd0a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 16 Mar 2021 16:16:51 +0000
Subject: [PATCH 356/420] Fix space panel spacings

---
 res/css/structures/_SpacePanel.scss | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/res/css/structures/_SpacePanel.scss b/res/css/structures/_SpacePanel.scss
index d3e7d7efee..ffe67ce6ab 100644
--- a/res/css/structures/_SpacePanel.scss
+++ b/res/css/structures/_SpacePanel.scss
@@ -63,7 +63,7 @@ $activeBorderColor: $secondary-fg-color;
     }
 
     .mx_AutoHideScrollbar {
-        padding: 16px 0;
+        padding: 8px 0 16px;
     }
 
     .mx_SpaceButton_toggleCollapse {
@@ -99,7 +99,6 @@ $activeBorderColor: $secondary-fg-color;
 
     .mx_SpaceButton {
         border-radius: 8px;
-        margin-bottom: 2px;
         display: flex;
         align-items: center;
         padding: 4px 4px 4px 0;

From 88b7c8f53dd8d043abbc4f589cb190e9e7c8b9d9 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 18 Mar 2021 13:17:30 +0000
Subject: [PATCH 357/420] Fix add existing to space dialog showing all spaces
 additionally as rooms

---
 src/components/views/dialogs/AddExistingToSpaceDialog.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/views/dialogs/AddExistingToSpaceDialog.tsx b/src/components/views/dialogs/AddExistingToSpaceDialog.tsx
index 66efaefd9d..500637244a 100644
--- a/src/components/views/dialogs/AddExistingToSpaceDialog.tsx
+++ b/src/components/views/dialogs/AddExistingToSpaceDialog.tsx
@@ -69,6 +69,7 @@ const AddExistingToSpaceDialog: React.FC<IProps> = ({ matrixClient: cli, space,
     const existingRoomsSet = new Set(existingRooms);
     const rooms = cli.getVisibleRooms().filter(room => {
         return !existingRoomsSet.has(room) // not already in space
+            && !room.isSpaceRoom() // not a space itself
             && room.name.toLowerCase().includes(lcQuery) // contains query
             && !DMRoomMap.shared().getUserIdForRoomId(room.roomId); // not a DM
     });

From 3718d550c5b97d722247c03d4a9bfafc03158b1c Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 19 Mar 2021 11:42:53 +0000
Subject: [PATCH 358/420] Fix space creation menu shade width

---
 res/css/views/spaces/_SpaceCreateMenu.scss |  5 +----
 src/components/views/spaces/SpacePanel.tsx | 10 ++++++++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/res/css/views/spaces/_SpaceCreateMenu.scss b/res/css/views/spaces/_SpaceCreateMenu.scss
index 2a11ec9f23..be387d2c26 100644
--- a/res/css/views/spaces/_SpaceCreateMenu.scss
+++ b/res/css/views/spaces/_SpaceCreateMenu.scss
@@ -14,10 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// TODO: the space panel currently does not have a fixed width,
-// just the headers at each level have a max-width of 150px
-// so this will look slightly off for now. We should probably use css grid for the whole main layout...
-$spacePanelWidth: 200px;
+$spacePanelWidth: 71px;
 
 .mx_SpaceCreateMenu_wrapper {
     // background blur everything except SpacePanel
diff --git a/src/components/views/spaces/SpacePanel.tsx b/src/components/views/spaces/SpacePanel.tsx
index 48e2c86b2c..bacf1bd929 100644
--- a/src/components/views/spaces/SpacePanel.tsx
+++ b/src/components/views/spaces/SpacePanel.tsx
@@ -220,13 +220,19 @@ const SpacePanel = () => {
                     <SpaceButton
                         className={newClasses}
                         tooltip={menuDisplayed ? _t("Cancel") : _t("Create a space")}
-                        onClick={menuDisplayed ? closeMenu : openMenu}
+                        onClick={menuDisplayed ? closeMenu : () => {
+                            openMenu();
+                            if (!isPanelCollapsed) setPanelCollapsed(true);
+                        }}
                         isNarrow={isPanelCollapsed}
                     />
                 </AutoHideScrollbar>
                 <AccessibleTooltipButton
                     className={classNames("mx_SpacePanel_toggleCollapse", {expanded: !isPanelCollapsed})}
-                    onClick={evt => setPanelCollapsed(!isPanelCollapsed)}
+                    onClick={() => {
+                        setPanelCollapsed(!isPanelCollapsed);
+                        if (menuDisplayed) closeMenu();
+                    }}
                     title={expandCollapseButtonTitle}
                 />
                 { contextMenu }

From 2b4c670b8964cf52c4762331f9e566527fdb1ad0 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 19 Mar 2021 11:46:44 +0000
Subject: [PATCH 359/420] Fix favourites not showing up in home until a refresh

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

diff --git a/src/stores/SpaceStore.tsx b/src/stores/SpaceStore.tsx
index a329ee78e1..b82acfd0ed 100644
--- a/src/stores/SpaceStore.tsx
+++ b/src/stores/SpaceStore.tsx
@@ -394,7 +394,9 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
     private onRoomAccountData = (ev: MatrixEvent, room: Room, lastEvent: MatrixEvent) => {
         if (ev.getType() === EventType.Tag && !room.isSpaceRoom()) {
             // If the room was in favourites and now isn't or the opposite then update its position in the trees
-            if (!!ev.getContent()[DefaultTagID.Favourite] !== !!lastEvent.getContent()[DefaultTagID.Favourite]) {
+            const oldTags = lastEvent.getContent()?.tags;
+            const newTags = ev.getContent()?.tags;
+            if (!!oldTags[DefaultTagID.Favourite] !== !!newTags[DefaultTagID.Favourite]) {
                 this.onRoomUpdate(room);
             }
         }

From 1fbbb67e7484115139ecb87d7299c7913b8994d4 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 19 Mar 2021 13:16:36 +0000
Subject: [PATCH 360/420] Consolidate button styles in Space creation flows

---
 res/css/structures/_SpaceRoomView.scss        | 105 ++++++++----------
 res/css/views/spaces/_SpaceCreateMenu.scss    |  44 +-------
 res/css/views/spaces/_SpacePublicShare.scss   |  33 +-----
 src/components/structures/SpaceRoomView.tsx   |  41 +++----
 .../views/spaces/SpacePublicShare.tsx         |   5 +-
 5 files changed, 66 insertions(+), 162 deletions(-)

diff --git a/res/css/structures/_SpaceRoomView.scss b/res/css/structures/_SpaceRoomView.scss
index 60abe36c29..a7ce630b96 100644
--- a/res/css/structures/_SpaceRoomView.scss
+++ b/res/css/structures/_SpaceRoomView.scss
@@ -16,6 +16,51 @@ limitations under the License.
 
 $SpaceRoomViewInnerWidth: 428px;
 
+@define-mixin SpacePillButton {
+    position: relative;
+    padding: 16px 32px 16px 72px;
+    width: 432px;
+    box-sizing: border-box;
+    border-radius: 8px;
+    border: 1px solid $input-darker-bg-color;
+    font-size: $font-15px;
+    margin: 20px 0;
+
+    > h3 {
+        font-weight: $font-semi-bold;
+        margin: 0 0 4px;
+    }
+
+    > span {
+        color: $secondary-fg-color;
+    }
+
+    &::before {
+        position: absolute;
+        content: '';
+        width: 32px;
+        height: 32px;
+        top: 24px;
+        left: 20px;
+        mask-position: center;
+        mask-repeat: no-repeat;
+        mask-size: 24px;
+        background-color: $tertiary-fg-color;
+    }
+
+    &:hover {
+        border-color: $accent-color;
+
+        &::before {
+            background-color: $accent-color;
+        }
+
+        > span {
+            color: $primary-fg-color;
+        }
+    }
+}
+
 .mx_SpaceRoomView {
     .mx_MainSplit > div:first-child {
         padding: 80px 60px;
@@ -331,64 +376,8 @@ $SpaceRoomViewInnerWidth: 428px;
     }
 
     .mx_SpaceRoomView_privateScope {
-        .mx_RadioButton {
-            width: $SpaceRoomViewInnerWidth;
-            border-radius: 8px;
-            border: 1px solid $space-button-outline-color;
-            padding: 16px 16px 16px 72px;
-            margin-top: 36px;
-            cursor: pointer;
-            box-sizing: border-box;
-            position: relative;
-
-            > div:first-of-type {
-                // hide radio dot
-                display: none;
-            }
-
-            .mx_RadioButton_content {
-                margin: 0;
-
-                > h3 {
-                    margin: 0 0 4px;
-                    font-size: $font-15px;
-                    font-weight: $font-semi-bold;
-                    line-height: $font-18px;
-                }
-
-                > div {
-                    color: $secondary-fg-color;
-                    font-size: $font-15px;
-                    line-height: $font-24px;
-                }
-            }
-
-            &::before {
-                content: "";
-                position: absolute;
-                height: 32px;
-                width: 32px;
-                top: 24px;
-                left: 20px;
-                background-color: $secondary-fg-color;
-                mask-repeat: no-repeat;
-                mask-position: center;
-                mask-size: contain;
-            }
-        }
-
-        .mx_RadioButton_checked {
-            border-color: $accent-color;
-
-            .mx_RadioButton_content {
-                > div {
-                    color: $primary-fg-color;
-                }
-            }
-
-            &::before {
-                background-color: $accent-color;
-            }
+        .mx_AccessibleButton {
+            @mixin SpacePillButton;
         }
 
         .mx_SpaceRoomView_privateScope_justMeButton::before {
diff --git a/res/css/views/spaces/_SpaceCreateMenu.scss b/res/css/views/spaces/_SpaceCreateMenu.scss
index be387d2c26..bea39e2389 100644
--- a/res/css/views/spaces/_SpaceCreateMenu.scss
+++ b/res/css/views/spaces/_SpaceCreateMenu.scss
@@ -45,53 +45,11 @@ $spacePanelWidth: 71px;
         }
 
         .mx_SpaceCreateMenuType {
-            position: relative;
-            padding: 16px 32px 16px 72px;
-            width: 432px;
-            box-sizing: border-box;
-            border-radius: 8px;
-            border: 1px solid $input-darker-bg-color;
-            font-size: $font-15px;
-            margin: 20px 0;
-
-            > h3 {
-                font-weight: $font-semi-bold;
-                margin: 0 0 4px;
-            }
-
-            > span {
-                color: $secondary-fg-color;
-            }
-
-            &::before {
-                position: absolute;
-                content: '';
-                width: 32px;
-                height: 32px;
-                top: 24px;
-                left: 20px;
-                mask-position: center;
-                mask-repeat: no-repeat;
-                mask-size: 32px;
-                background-color: $tertiary-fg-color;
-            }
-
-            &:hover {
-                border-color: $accent-color;
-
-                &::before {
-                    background-color: $accent-color;
-                }
-
-                > span {
-                    color: $primary-fg-color;
-                }
-            }
+            @mixin SpacePillButton;
         }
 
         .mx_SpaceCreateMenuType_public::before {
             mask-image: url('$(res)/img/globe.svg');
-            mask-size: 26px;
         }
         .mx_SpaceCreateMenuType_private::before {
             mask-image: url('$(res)/img/element-icons/lock.svg');
diff --git a/res/css/views/spaces/_SpacePublicShare.scss b/res/css/views/spaces/_SpacePublicShare.scss
index 9ba0549ae3..373fa94e00 100644
--- a/res/css/views/spaces/_SpacePublicShare.scss
+++ b/res/css/views/spaces/_SpacePublicShare.scss
@@ -16,38 +16,7 @@ limitations under the License.
 
 .mx_SpacePublicShare {
     .mx_AccessibleButton {
-        border: 1px solid $space-button-outline-color;
-        box-sizing: border-box;
-        border-radius: 8px;
-        padding: 12px 24px 12px 52px;
-        margin-top: 16px;
-        width: $SpaceRoomViewInnerWidth;
-        font-size: $font-15px;
-        line-height: $font-24px;
-        position: relative;
-        display: flex;
-
-        > span {
-            color: #368bd6;
-            margin-left: auto;
-        }
-
-        &:hover {
-            background-color: rgba(141, 151, 165, 0.1);
-        }
-
-        &::before {
-            content: "";
-            position: absolute;
-            width: 30px;
-            height: 30px;
-            mask-repeat: no-repeat;
-            mask-size: contain;
-            mask-position: center;
-            background: $muted-fg-color;
-            left: 12px;
-            top: 9px;
-        }
+        @mixin SpacePillButton;
 
         &.mx_SpacePublicShare_shareButton::before {
             mask-image: url('$(res)/img/element-icons/link.svg');
diff --git a/src/components/structures/SpaceRoomView.tsx b/src/components/structures/SpaceRoomView.tsx
index cfa261bb9b..23cd2f898c 100644
--- a/src/components/structures/SpaceRoomView.tsx
+++ b/src/components/structures/SpaceRoomView.tsx
@@ -32,7 +32,6 @@ import {useRoomMembers} from "../../hooks/useRoomMembers";
 import createRoom, {IOpts, Preset} from "../../createRoom";
 import Field from "../views/elements/Field";
 import {useEventEmitter} from "../../hooks/useEventEmitter";
-import StyledRadioGroup from "../views/elements/StyledRadioGroup";
 import withValidation from "../views/elements/Validation";
 import * as Email from "../../email";
 import defaultDispatcher from "../../dispatcher/dispatcher";
@@ -443,32 +442,20 @@ const SpaceSetupPrivateScope = ({ onFinished }) => {
         <h1>{ _t("Who are you working with?") }</h1>
         <div className="mx_SpaceRoomView_description">{ _t("Ensure the right people have access to the space.") }</div>
 
-        <StyledRadioGroup
-            name="privateSpaceScope"
-            value={option}
-            onChange={setOption}
-            definitions={[
-                {
-                    value: "justMe",
-                    className: "mx_SpaceRoomView_privateScope_justMeButton",
-                    label: <React.Fragment>
-                        <h3>{ _t("Just Me") }</h3>
-                        <div>{ _t("A private space just for you") }</div>
-                    </React.Fragment>,
-                }, {
-                    value: "meAndMyTeammates",
-                    className: "mx_SpaceRoomView_privateScope_meAndMyTeammatesButton",
-                    label: <React.Fragment>
-                        <h3>{ _t("Me and my teammates") }</h3>
-                        <div>{ _t("A private space for you and your teammates") }</div>
-                    </React.Fragment>,
-                },
-            ]}
-        />
-
-        <div className="mx_SpaceRoomView_buttons">
-            <FormButton label={_t("Next")} disabled={!option} onClick={() => onFinished(option !== "justMe")} />
-        </div>
+        <AccessibleButton
+            className="mx_SpaceRoomView_privateScope_justMeButton"
+            onClick={() => { onFinished(false) }}
+        >
+            <h3>{ _t("Just me") }</h3>
+            <div>{ _t("A private space to organise your rooms") }</div>
+        </AccessibleButton>
+        <AccessibleButton
+            className="mx_SpaceRoomView_privateScope_meAndMyTeammatesButton"
+            onClick={() => { onFinished(true) }}
+        >
+            <h3>{ _t("Me and my teammates") }</h3>
+            <div>{ _t("A private space for you and your teammates") }</div>
+        </AccessibleButton>
     </div>;
 };
 
diff --git a/src/components/views/spaces/SpacePublicShare.tsx b/src/components/views/spaces/SpacePublicShare.tsx
index 3930c1db16..07257d295f 100644
--- a/src/components/views/spaces/SpacePublicShare.tsx
+++ b/src/components/views/spaces/SpacePublicShare.tsx
@@ -47,7 +47,7 @@ const SpacePublicShare = ({ space, onFinished }: IProps) => {
                 }
             }}
         >
-            { _t("Share invite link") }
+            <h3>{ _t("Share invite link") }</h3>
             <span>{ copiedText }</span>
         </AccessibleButton>
         <AccessibleButton
@@ -57,7 +57,8 @@ const SpacePublicShare = ({ space, onFinished }: IProps) => {
                 onFinished();
             }}
         >
-            { _t("Invite by email or username") }
+            <h3>{ _t("Invite people") }</h3>
+            <span>{ _t("Invite with email or username") }</span>
         </AccessibleButton>
     </div>;
 };

From 76dffdcb2c0671ea30d0c77a9b1374fe9c455cf4 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 19 Mar 2021 13:20:04 +0000
Subject: [PATCH 361/420] Tweak space creation copy and auto focus fields

---
 src/components/structures/SpaceRoomView.tsx   | 41 +++++++++++--------
 .../views/spaces/SpaceCreateMenu.tsx          |  2 +-
 .../views/spaces/SpacePublicShare.tsx         |  2 +-
 src/i18n/strings/en_EN.json                   | 25 +++++------
 4 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/src/components/structures/SpaceRoomView.tsx b/src/components/structures/SpaceRoomView.tsx
index 23cd2f898c..f0789e1e21 100644
--- a/src/components/structures/SpaceRoomView.tsx
+++ b/src/components/structures/SpaceRoomView.tsx
@@ -364,6 +364,7 @@ const SpaceSetupFirstRooms = ({ space, title, description, onFinished }) => {
             placeholder={placeholders[i]}
             value={roomNames[i]}
             onChange={ev => setRoomName(i, ev.target.value)}
+            autoFocus={i === 2}
         />;
     });
 
@@ -418,13 +419,9 @@ const SpaceSetupFirstRooms = ({ space, title, description, onFinished }) => {
 
 const SpaceSetupPublicShare = ({ space, onFinished }) => {
     return <div className="mx_SpaceRoomView_publicShare">
-        <h1>{ _t("Invite people") }</h1>
-        <div className="mx_SpaceRoomView_description">
-            {
-                _t("It's just you at the moment.")
-            } {
-                _t("%(spaceName)s will be even better with others", { spaceName: space.name })
-            }
+        <h1>{ _t("Share %(name)s", { name: space.name }) }</h1>
+        <div className="mx_SpacePublicShare_description">
+            { _t("It's just you at the moment, it will be even better with others.") }
         </div>
 
         <SpacePublicShare space={space} onFinished={onFinished} />
@@ -435,12 +432,12 @@ const SpaceSetupPublicShare = ({ space, onFinished }) => {
     </div>;
 };
 
-const SpaceSetupPrivateScope = ({ onFinished }) => {
-    const [option, setOption] = useState<string>(null);
-
+const SpaceSetupPrivateScope = ({ space, onFinished }) => {
     return <div className="mx_SpaceRoomView_privateScope">
         <h1>{ _t("Who are you working with?") }</h1>
-        <div className="mx_SpaceRoomView_description">{ _t("Ensure the right people have access to the space.") }</div>
+        <div className="mx_SpaceRoomView_description">
+            { _t("Make sure the right people have access to %(name)s", { name: space.name }) }
+        </div>
 
         <AccessibleButton
             className="mx_SpaceRoomView_privateScope_justMeButton"
@@ -485,6 +482,7 @@ const SpaceSetupPrivateInvite = ({ space, onFinished }) => {
             onChange={ev => setEmailAddress(i, ev.target.value)}
             ref={fieldRefs[i]}
             onValidate={validateEmailRules}
+            autoFocus={i === 0}
         />;
     });
 
@@ -522,9 +520,18 @@ const SpaceSetupPrivateInvite = ({ space, onFinished }) => {
         setBusy(false);
     };
 
+    let onClick = onFinished;
+    let buttonLabel = _t("Skip for now");
+    if (emailAddresses.some(name => name.trim())) {
+        onClick = onNextClick;
+        buttonLabel = busy ? _t("Inviting...") : _t("Continue")
+    }
+
     return <div className="mx_SpaceRoomView_inviteTeammates">
         <h1>{ _t("Invite your teammates") }</h1>
-        <div className="mx_SpaceRoomView_description">{ _t("Ensure the right people have access to the space.") }</div>
+        <div className="mx_SpaceRoomView_description">
+            { _t("Make sure the right people have access. You can invite more later.") }
+        </div>
 
         { error && <div className="mx_SpaceRoomView_errorText">{ error }</div> }
         { fields }
@@ -539,8 +546,7 @@ const SpaceSetupPrivateInvite = ({ space, onFinished }) => {
         </div>
 
         <div className="mx_SpaceRoomView_buttons">
-            <AccessibleButton onClick={onFinished} kind="link">{_t("Skip for now")}</AccessibleButton>
-            <FormButton label={busy ? _t("Inviting...") : _t("Next")} disabled={busy} onClick={onNextClick} />
+            <FormButton label={buttonLabel} disabled={busy} onClick={onClick} />
         </div>
     </div>;
 };
@@ -673,7 +679,8 @@ export default class SpaceRoomView extends React.PureComponent<IProps, IState> {
                 return <SpaceSetupFirstRooms
                     space={this.props.space}
                     title={_t("What are some things you want to discuss?")}
-                    description={_t("We'll create a room for each of them. You can add more later too.")}
+                    description={_t("Let's create a room for each of them. " +
+                        "You can add more later too, including already existing ones.")}
                     onFinished={() => this.setState({ phase: Phase.PublicShare })}
                 />;
             case Phase.PublicShare:
@@ -681,6 +688,7 @@ export default class SpaceRoomView extends React.PureComponent<IProps, IState> {
 
             case Phase.PrivateScope:
                 return <SpaceSetupPrivateScope
+                    space={this.props.space}
                     onFinished={(invite: boolean) => {
                         this.setState({ phase: invite ? Phase.PrivateInvite : Phase.PrivateCreateRooms });
                     }}
@@ -694,7 +702,8 @@ export default class SpaceRoomView extends React.PureComponent<IProps, IState> {
                 return <SpaceSetupFirstRooms
                     space={this.props.space}
                     title={_t("What projects are you working on?")}
-                    description={_t("We'll create rooms for each of them. You can add existing rooms after setup.")}
+                    description={_t("We'll create rooms for each of them. " +
+                        "You can add more later too, including already existing ones.")}
                     onFinished={() => this.setState({ phase: Phase.Landing })}
                 />;
         }
diff --git a/src/components/views/spaces/SpaceCreateMenu.tsx b/src/components/views/spaces/SpaceCreateMenu.tsx
index ca5b25f128..879cf929e0 100644
--- a/src/components/views/spaces/SpaceCreateMenu.tsx
+++ b/src/components/views/spaces/SpaceCreateMenu.tsx
@@ -108,7 +108,7 @@ const SpaceCreateMenu = ({ onFinished }) => {
         body = <React.Fragment>
             <h2>{ _t("Create a space") }</h2>
             <p>{ _t("Spaces are new ways to group rooms and people. " +
-                "To join an existing space you’ll need an invite") }</p>
+                "To join an existing space you'll need an invite.") }</p>
 
             <SpaceCreateMenuType
                 title={_t("Public")}
diff --git a/src/components/views/spaces/SpacePublicShare.tsx b/src/components/views/spaces/SpacePublicShare.tsx
index 07257d295f..b2d3b7ce29 100644
--- a/src/components/views/spaces/SpacePublicShare.tsx
+++ b/src/components/views/spaces/SpacePublicShare.tsx
@@ -41,7 +41,7 @@ const SpacePublicShare = ({ space, onFinished }: IProps) => {
                 const success = await copyPlaintext(permalinkCreator.forRoom());
                 const text = success ? _t("Copied!") : _t("Failed to copy");
                 setCopiedText(text);
-                await sleep(10);
+                await sleep(5000);
                 if (copiedText === text) { // if the text hasn't changed by another click then clear it after some time
                     setCopiedText(_t("Click to copy"));
                 }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 4be6e06459..5ba787422f 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -989,7 +989,7 @@
     "Name": "Name",
     "Description": "Description",
     "Create a space": "Create a space",
-    "Spaces are new ways to group rooms and people. To join an existing space you’ll need an invite": "Spaces are new ways to group rooms and people. To join an existing space you’ll need an invite",
+    "Spaces are new ways to group rooms and people. To join an existing space you'll need an invite.": "Spaces are new ways to group rooms and people. To join an existing space you'll need an invite.",
     "Public": "Public",
     "Open space for anyone, best for communities": "Open space for anyone, best for communities",
     "Private": "Private",
@@ -1009,10 +1009,10 @@
     "Copied!": "Copied!",
     "Failed to copy": "Failed to copy",
     "Share invite link": "Share invite link",
-    "Invite by email or username": "Invite by email or username",
+    "Invite people": "Invite people",
+    "Invite with email or username": "Invite with email or username",
     "Invite members": "Invite members",
     "Share your public space": "Share your public space",
-    "Invite people": "Invite people",
     "Settings": "Settings",
     "Leave space": "Leave space",
     "New room": "New room",
@@ -2629,23 +2629,24 @@
     "Failed to create initial space rooms": "Failed to create initial space rooms",
     "Skip for now": "Skip for now",
     "Creating rooms...": "Creating rooms...",
-    "It's just you at the moment.": "It's just you at the moment.",
-    "%(spaceName)s will be even better with others": "%(spaceName)s will be even better with others",
+    "Share %(name)s": "Share %(name)s",
+    "It's just you at the moment, it will be even better with others.": "It's just you at the moment, it will be even better with others.",
     "Go to my first room": "Go to my first room",
     "Who are you working with?": "Who are you working with?",
-    "Ensure the right people have access to the space.": "Ensure the right people have access to the space.",
-    "Just Me": "Just Me",
-    "A private space just for you": "A private space just for you",
+    "Make sure the right people have access to %(name)s": "Make sure the right people have access to %(name)s",
+    "Just me": "Just me",
+    "A private space to organise your rooms": "A private space to organise your rooms",
     "Me and my teammates": "Me and my teammates",
     "A private space for you and your teammates": "A private space for you and your teammates",
     "Failed to invite the following users to your space: %(csvUsers)s": "Failed to invite the following users to your space: %(csvUsers)s",
-    "Invite your teammates": "Invite your teammates",
-    "Invite by username": "Invite by username",
     "Inviting...": "Inviting...",
+    "Invite your teammates": "Invite your teammates",
+    "Make sure the right people have access. You can invite more later.": "Make sure the right people have access. You can invite more later.",
+    "Invite by username": "Invite by username",
     "What are some things you want to discuss?": "What are some things you want to discuss?",
-    "We'll create a room for each of them. You can add more later too.": "We'll create a room for each of them. You can add more later too.",
+    "Let's create a room for each of them. You can add more later too, including already existing ones.": "Let's create a room for each of them. You can add more later too, including already existing ones.",
     "What projects are you working on?": "What projects are you working on?",
-    "We'll create rooms for each of them. You can add existing rooms after setup.": "We'll create rooms for each of them. You can add existing rooms after setup.",
+    "We'll create rooms for each of them. You can add more later too, including already existing ones.": "We'll create rooms for each of them. You can add more later too, including already existing ones.",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Tried to load a specific point in this room's timeline, but was unable to find it.",
     "Failed to load timeline position": "Failed to load timeline position",

From 70e0b77fc4db3f9ac6a83b903e15fa25fa0be907 Mon Sep 17 00:00:00 2001
From: Jaiwanth <jaiwanth2011@gmail.com>
Date: Fri, 19 Mar 2021 21:12:47 +0530
Subject: [PATCH 362/420] Changed invite phrases in context menu and invite
 dialog

---
 src/components/views/dialogs/InviteDialog.tsx | 4 +++-
 src/components/views/rooms/RoomTile.tsx       | 2 +-
 src/i18n/strings/en_EN.json                   | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/views/dialogs/InviteDialog.tsx b/src/components/views/dialogs/InviteDialog.tsx
index 9aef421d5a..de0b5b237b 100644
--- a/src/components/views/dialogs/InviteDialog.tsx
+++ b/src/components/views/dialogs/InviteDialog.tsx
@@ -1256,7 +1256,9 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
                 ? _t("Invite to %(spaceName)s", {
                     spaceName: room.name || _t("Unnamed Space"),
                 })
-                : _t("Invite to this room");
+                : _t("Invite to %(roomName)s", {
+                    roomName: room.name || _t("Unnamed Room"),
+                });
 
             let helpTextUntranslated;
             if (isSpace) {
diff --git a/src/components/views/rooms/RoomTile.tsx b/src/components/views/rooms/RoomTile.tsx
index c6be8182ee..7eaad9e204 100644
--- a/src/components/views/rooms/RoomTile.tsx
+++ b/src/components/views/rooms/RoomTile.tsx
@@ -496,7 +496,7 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
                     {canInvite ? (
                         <IconizedContextMenuOption
                             onClick={this.onInviteClick}
-                            label={_t("Invite to this room")}
+                            label={_t("Invite People")}
                             iconClassName="mx_RoomTile_iconInvite"
                         />
                     ) : null}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 07d292a0e7..34a346fef0 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1601,6 +1601,7 @@
     "Favourited": "Favourited",
     "Favourite": "Favourite",
     "Low Priority": "Low Priority",
+    "Invite People": "Invite People",
     "Leave Room": "Leave Room",
     "Room options": "Room options",
     "%(count)s unread messages including mentions.|other": "%(count)s unread messages including mentions.",
@@ -2201,6 +2202,7 @@
     "Go": "Go",
     "Invite to %(spaceName)s": "Invite to %(spaceName)s",
     "Unnamed Space": "Unnamed Space",
+    "Invite to %(roomName)s": "Invite to %(roomName)s",
     "Invite someone using their name, email address, username (like <userId/>) or <a>share this space</a>.": "Invite someone using their name, email address, username (like <userId/>) or <a>share this space</a>.",
     "Invite someone using their name, username (like <userId/>) or <a>share this space</a>.": "Invite someone using their name, username (like <userId/>) or <a>share this space</a>.",
     "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.": "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.",

From 495cbadb08f7ab9cf7f961459d3dc843297e9faf Mon Sep 17 00:00:00 2001
From: Jaiwanth <jaiwanth2011@gmail.com>
Date: Fri, 19 Mar 2021 22:46:19 +0530
Subject: [PATCH 363/420] Update src/components/views/rooms/RoomTile.tsx

---
 src/components/views/rooms/RoomTile.tsx | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/components/views/rooms/RoomTile.tsx b/src/components/views/rooms/RoomTile.tsx
index 7eaad9e204..79db460275 100644
--- a/src/components/views/rooms/RoomTile.tsx
+++ b/src/components/views/rooms/RoomTile.tsx
@@ -464,16 +464,8 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
             const isLowPriority = roomTags.includes(DefaultTagID.LowPriority);
             const lowPriorityLabel = _t("Low Priority");
 
-            const inRoom = this.props.room.getMyMembership() === "join";
             const userId = MatrixClientPeg.get().getUserId();
-            let canInvite = inRoom;
-            const powerLevels = this.props.room.currentState
-                .getStateEvents("m.room.power_levels", "")
-                ?.getContent();
-            const me = this.props.room.getMember(userId);
-            if (powerLevels && me && powerLevels.invite > me.powerLevel) {
-                canInvite = false;
-            }
+            const canInvite = this.props.room.canInvite(userId);
             contextMenu = <IconizedContextMenu
                 {...contextMenuBelow(this.state.generalMenuPosition)}
                 onFinished={this.onCloseGeneralMenu}

From 207ba11da12f09e8bd84f057c585f4bb93a85f53 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 19 Mar 2021 17:08:01 -0600
Subject: [PATCH 364/420] Tweak a bunch of settings

---
 src/voice/VoiceRecorder.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/voice/VoiceRecorder.ts b/src/voice/VoiceRecorder.ts
index 66eb64b424..3d1008d45e 100644
--- a/src/voice/VoiceRecorder.ts
+++ b/src/voice/VoiceRecorder.ts
@@ -26,10 +26,15 @@ export class VoiceRecorder {
         mediaTrackConstraints: <MediaTrackConstraints>{
             deviceId: CallMediaHandler.getAudioInput(),
         },
-        encoderSampleRate: 16000, // we could go down to 12khz, but we lose quality
+        encoderSampleRate: 48000, // we could go down to 12khz, but we lose quality. 48khz is a webrtc default
         encoderApplication: 2048, // voice (default is "audio")
         streamPages: true, // so we can have a live EQ for the user
-        encoderFrameSize: 10, // we want updates fairly regularly for the UI
+        encoderFrameSize: 20, // ms, we want updates fairly regularly for the UI
+        numberOfChannels: 1, // stereo isn't important for us
+        //sourceNode: instanceof MediaStreamAudioSourceNode, // TODO: @@ Travis: Use this for EQ stuff.
+        encoderBitRate: 64000, // 64kbps is average for webrtc
+        encoderComplexity: 3, // 0-10, 0 is fast and low complexity
+        resampleQuality: 3, // 0-10, 10 is slow and high quality
     });
     private buffer = new Uint8Array(0);
     private mxc: string;

From 48db1a5967a3565f399de71f9b37aee22b361ac7 Mon Sep 17 00:00:00 2001
From: libexus <Asterixeins324@gmail.com>
Date: Fri, 19 Mar 2021 19:43:53 +0000
Subject: [PATCH 365/420] Translated using Weblate (German)

Currently translated at 96.7% (2794 of 2889 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
---
 src/i18n/strings/de_DE.json | 188 ++++++++++++++++++------------------
 1 file changed, 96 insertions(+), 92 deletions(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index a8b2ac7878..22f27823a6 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1,5 +1,5 @@
 {
-    "Filter room members": "Raum-Mitglieder filtern",
+    "Filter room members": "Raummitglieder filtern",
     "You have no visible notifications": "Du hast keine sichtbaren Benachrichtigungen",
     "Invites": "Einladungen",
     "Favourites": "Favoriten",
@@ -97,7 +97,7 @@
     "VoIP conference started.": "VoIP-Konferenz gestartet.",
     "Who can access this room?": "Wer kann diesen Raum betreten?",
     "Who can read history?": "Wer kann den bisherigen Chatverlauf lesen?",
-    "You do not have permission to post to this room": "Du hast keine Berechtigung, in diesem Raum etwas zu senden",
+    "You do not have permission to post to this room": "Du hast keine Berechtigung, etwas in diesen Raum zu senden",
     "Call Timeout": "Anruf-Timeout",
     "Existing Call": "Bereits bestehender Anruf",
     "Failed to verify email address: make sure you clicked the link in the email": "Verifizierung der E-Mail-Adresse fehlgeschlagen: Bitte stelle sicher, dass du den Link in der E-Mail angeklickt hast",
@@ -193,7 +193,7 @@
     "and %(count)s others...|one": "und ein(e) weitere(r)...",
     "Are you sure?": "Bist du sicher?",
     "Attachment": "Anhang",
-    "Ban": "Verbannen",
+    "Ban": "Bannen",
     "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>.": "Es kann keine Verbindung zum Heimserver via HTTP aufgebaut werden, wenn die Adresszeile des Browsers eine HTTPS-URL enthält. Entweder HTTPS verwenden oder alternativ <a>unsichere Skripte erlauben</a>.",
     "Click to mute audio": "Klicke um den Ton stumm zu stellen",
     "Click to mute video": "Klicken, um das Video stummzuschalten",
@@ -210,7 +210,7 @@
     "Failed to set display name": "Anzeigename konnte nicht gesetzt werden",
     "Fill screen": "Fülle Bildschirm",
     "Incorrect verification code": "Falscher Verifizierungscode",
-    "Join Room": "Dem Raum beitreten",
+    "Join Room": "Raum beitreten",
     "Kick": "Kicken",
     "not specified": "nicht spezifiziert",
     "No more results": "Keine weiteren Ergebnisse",
@@ -218,7 +218,7 @@
     "OK": "OK",
     "Search": "Suchen",
     "Search failed": "Suche ist fehlgeschlagen",
-    "Server error": "Server-Fehler",
+    "Server error": "Serverfehler",
     "Server may be unavailable, overloaded, or search timed out :(": "Der Server ist entweder nicht verfügbar, überlastet oder die Suche wurde wegen Zeitüberschreitung abgebrochen :(",
     "Server unavailable, overloaded, or something else went wrong.": "Server ist nicht verfügbar, überlastet oder ein anderer Fehler ist aufgetreten.",
     "%(count)s of your messages have not been sent.|other": "Einige deiner Nachrichten wurden nicht gesendet.",
@@ -255,7 +255,7 @@
     "Operation failed": "Aktion fehlgeschlagen",
     "Unmute": "Stummschalten aufheben",
     "Invalid file%(extra)s": "Ungültige Datei%(extra)s",
-    "Please select the destination room for this message": "Bitte den Raum auswählen, an den diese Nachricht gesendet werden soll",
+    "Please select the destination room for this message": "Wähle den Raum aus, an den du die Nachricht schicken willst",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s hat den Raum-Namen entfernt.",
     "Passphrases must match": "Passphrases müssen übereinstimmen",
     "Passphrase must not be empty": "Passphrase darf nicht leer sein",
@@ -280,8 +280,8 @@
     "Please enter the code it contains:": "Bitte gib den darin enthaltenen Code ein:",
     "powered by Matrix": "betrieben mit Matrix",
     "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Wenn du keine E-Mail-Adresse angibst, wirst du nicht in der Lage sein, dein Passwort zurückzusetzen. Bist du sicher?",
-    "Error decrypting audio": "Audio-Entschlüsselung fehlgeschlagen",
-    "Error decrypting image": "Bild-Entschlüsselung fehlgeschlagen",
+    "Error decrypting audio": "Entschlüsseln des Audios fehlgeschlagen",
+    "Error decrypting image": "Entschlüsselung des Bilds fehlgeschlagen",
     "Error decrypting video": "Video-Entschlüsselung fehlgeschlagen",
     "Import room keys": "Raum-Schlüssel importieren",
     "File to import": "Zu importierende Datei",
@@ -299,14 +299,14 @@
     "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "Dieser Prozess erlaubt es dir, die zuvor von einem anderen Matrix-Client exportierten Verschlüsselungs-Schlüssel zu importieren. Danach kannst du alle Nachrichten entschlüsseln, die auch bereits auf dem anderen Client entschlüsselt werden konnten.",
     "If you have previously used a more recent version of %(brand)s, your session may be incompatible with this version. Close this window and return to the more recent version.": "Wenn du zuvor eine aktuellere Version von %(brand)s verwendet hast, ist deine Sitzung eventuell inkompatibel mit dieser Version. Bitte schließe dieses Fenster und kehre zur aktuelleren Version zurück.",
     "Drop file here to upload": "Datei hier loslassen zum hochladen",
-    "Idle": "Untätig",
+    "Idle": "Abwesend",
     "Ongoing conference call%(supportedText)s.": "Laufendes Konferenzgespräch%(supportedText)s.",
-    "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Du wirst jetzt auf die Website eines Drittanbieters weitergeleitet, damit du dein Benutzerkonto für die Verwendung von %(integrationsUrl)s authentifizieren kannst. Möchtest du fortfahren?",
+    "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?": "Um dein Konto für die Verwendung von %(integrationsUrl)s zu authentifizieren, wirst du jetzt auf die Website eines Drittanbieters weitergeleitet. Möchtest du fortfahren?",
     "Start automatically after system login": "Nach System-Login automatisch starten",
     "Jump to first unread message.": "Zur ersten ungelesenen Nachricht springen.",
     "Options": "Optionen",
     "Invited": "Eingeladen",
-    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s hat das Raum-Bild entfernt.",
+    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s hat das Raumbild entfernt.",
     "No Webcams detected": "Keine Webcam erkannt",
     "No Microphones detected": "Keine Mikrofone erkannt",
     "No media permissions": "Keine Medienberechtigungen",
@@ -322,14 +322,14 @@
     "Anyone": "Jeder",
     "Are you sure you want to leave the room '%(roomName)s'?": "Bist du sicher, dass du den Raum '%(roomName)s' verlassen möchtest?",
     "Custom level": "Benutzerdefiniertes Berechtigungslevel",
-    "Publish this room to the public in %(domain)s's room directory?": "Diesen Raum im Raum-Verzeichnis von %(domain)s veröffentlichen?",
+    "Publish this room to the public in %(domain)s's room directory?": "Diesen Raum im Raumverzeichnis von %(domain)s veröffentlichen?",
     "Register": "Registrieren",
     "Save": "Speichern",
     "Verified key": "Verifizierter Schlüssel",
     "You have <a>disabled</a> URL previews by default.": "Du hast die URL-Vorschau standardmäßig <a>deaktiviert</a>.",
     "You have <a>enabled</a> URL previews by default.": "Du hast die URL-Vorschau standardmäßig <a>aktiviert</a>.",
-    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s hat das Raum-Bild geändert zu <img/>",
-    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s hat das Raum-Bild für %(roomName)s geändert",
+    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s hat das Raumbild zu <img/> geändert",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s hat das Raumbild von %(roomName)s geändert",
     "Add": "Hinzufügen",
     "Error: Problem communicating with the given homeserver.": "Fehler: Problem bei der Kommunikation mit dem angegebenen Home-Server.",
     "Failed to fetch avatar URL": "Abrufen der Avatar-URL fehlgeschlagen",
@@ -344,14 +344,14 @@
     "New Password": "Neues Passwort",
     "Username available": "Benutzername ist verfügbar",
     "Username not available": "Benutzername ist nicht verfügbar",
-    "Something went wrong!": "Etwas ging schief!",
+    "Something went wrong!": "Etwas ist schiefgelaufen!",
     "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Dies wird dein zukünftiger Benutzername auf dem <span></span> Heimserver. Alternativ kannst du auch einen <a>anderen Server</a> auswählen.",
     "If you already have a Matrix account you can <a>log in</a> instead.": "Wenn du bereits ein Matrix-Benutzerkonto hast, kannst du dich stattdessen auch direkt <a>anmelden</a>.",
     "Home": "Startseite",
     "Username invalid: %(errMessage)s": "Ungültiger Benutzername: %(errMessage)s",
     "Accept": "Akzeptieren",
     "Active call (%(roomName)s)": "Aktiver Anruf (%(roomName)s)",
-    "Admin Tools": "Admin-Werkzeuge",
+    "Admin Tools": "Administratorwerkzeuge",
     "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.": "Verbindung zum Heimserver fehlgeschlagen - bitte überprüfe die Internetverbindung und stelle sicher, dass dem <a>SSL-Zertifikat deines Heimservers</a> vertraut wird und dass Anfragen nicht durch eine Browser-Erweiterung blockiert werden.",
     "Close": "Schließen",
     "Custom": "Erweitert",
@@ -366,9 +366,9 @@
     "No display name": "Kein Anzeigename",
     "Private Chat": "Privater Chat",
     "Public Chat": "Öffentlicher Chat",
-    "%(roomName)s does not exist.": "%(roomName)s existert nicht.",
-    "%(roomName)s is not accessible at this time.": "%(roomName)s ist aktuell nicht zugreifbar.",
-    "Seen by %(userName)s at %(dateTime)s": "Gesehen von %(userName)s um %(dateTime)s",
+    "%(roomName)s does not exist.": "%(roomName)s existiert nicht.",
+    "%(roomName)s is not accessible at this time.": "Auf %(roomName)s kann momentan nicht zugegriffen werden.",
+    "Seen by %(userName)s at %(dateTime)s": "Von %(userName)s um %(dateTime)s gesehen",
     "Start authentication": "Authentifizierung beginnen",
     "This room": "diesen Raum",
     "unknown caller": "Unbekannter Anrufer",
@@ -376,7 +376,7 @@
     "Upload new:": "Neue(s) hochladen:",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (Berechtigungslevel %(powerLevelNumber)s)",
     "(~%(count)s results)|one": "(~%(count)s Ergebnis)",
-    "(~%(count)s results)|other": "(~%(count)s Ergebnis)",
+    "(~%(count)s results)|other": "(~%(count)s Ergebnisse)",
     "(could not connect media)": "(Medienverbindung konnte nicht hergestellt werden)",
     "(no answer)": "(keine Antwort)",
     "(unknown failure: %(reason)s)": "(Unbekannter Fehler: %(reason)s)",
@@ -474,7 +474,7 @@
     "Invalid community ID": "Ungültige Community-ID",
     "'%(groupId)s' is not a valid community ID": "'%(groupId)s' ist keine gültige Community-ID",
     "New community ID (e.g. +foo:%(localDomain)s)": "Neue Community-ID (z. B. +foo:%(localDomain)s)",
-    "Remove from community": "Aus der Community entfernen",
+    "Remove from community": "Aus Community entfernen",
     "Failed to remove user from community": "Entfernen des Benutzers aus der Community fehlgeschlagen",
     "Filter community members": "Community-Mitglieder filtern",
     "Filter community rooms": "Community-Räume filtern",
@@ -598,12 +598,12 @@
     "%(duration)sh": "%(duration)sh",
     "%(duration)sd": "%(duration)sT",
     "Online for %(duration)s": "Online seit %(duration)s",
-    "Idle for %(duration)s": "Untätig seit %(duration)s",
+    "Idle for %(duration)s": "Abwesend seit %(duration)s",
     "Offline for %(duration)s": "Offline seit %(duration)s",
     "Unknown for %(duration)s": "Unbekannt seit %(duration)s",
     "Flair": "Abzeichen",
     "Showing flair for these communities:": "Abzeichen für diese Communities zeigen:",
-    "This room is not showing flair for any communities": "Dieser Raum zeigt für keine Communities die Abzeichen an",
+    "This room is not showing flair for any communities": "Dieser Raum zeigt Abzeichen keiner Communities an",
     "Something went wrong when trying to get your communities.": "Beim Laden deiner Communities ist etwas schief gelaufen.",
     "Display your community flair in rooms configured to show it.": "Zeige deinen Community-Flair in den Räumen, die es erlauben.",
     "This homeserver doesn't offer any login flows which are supported by this client.": "Dieser Heimserver verfügt über kein von diesem Client unterstütztes Anmeldeverfahren.",
@@ -643,7 +643,7 @@
     "Did you know: you can use communities to filter your %(brand)s experience!": "Wusstest du: Du kannst Communities nutzen um deine %(brand)s-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.",
     "Clear filter": "Filter zurücksetzen",
-    "Key request sent.": "Schlüssel-Anfragen gesendet.",
+    "Key request sent.": "Schlüsselanfrage gesendet.",
     "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Wenn du einen Fehler via GitHub meldest, können Fehlerberichte uns helfen um das Problem zu finden. Sie enthalten Anwendungsdaten wie deinen Nutzernamen, Raum- und Gruppen-ID's und Aliase die du besucht hast und Nutzernamen anderer Nutzer. Sie enthalten keine Nachrichten.",
     "Submit debug logs": "Fehlerberichte einreichen",
     "Code": "Code",
@@ -655,8 +655,8 @@
     "Join this community": "Community beitreten",
     "Leave this community": "Community verlassen",
     "You don't currently have any stickerpacks enabled": "Du hast aktuell keine Stickerpacks aktiviert",
-    "Hide Stickers": "Sticker verbergen",
-    "Show Stickers": "Sticker zeigen",
+    "Hide Stickers": "Sticker ausblenden",
+    "Show Stickers": "Sticker anzeigen",
     "Who can join this community?": "Wer kann dieser Community beitreten?",
     "Everyone": "Jeder",
     "Stickerpack": "Stickerpack",
@@ -809,7 +809,7 @@
     "Terms and Conditions": "Geschäftsbedingungen",
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Um den %(homeserverDomain)s -Heimserver weiter zu verwenden, musst du die Geschäftsbedingungen sichten und ihnen zustimmen.",
     "Review terms and conditions": "Geschäftsbedingungen anzeigen",
-    "Share Link to User": "Link zum Benutzer teilen",
+    "Share Link to User": "Link zu Benutzer teilen",
     "Share room": "Raum teilen",
     "Share Room": "Raum teilen",
     "Link to most recent message": "Link zur aktuellsten Nachricht",
@@ -821,15 +821,15 @@
     "Share Message": "Nachricht teilen",
     "No Audio Outputs detected": "Keine Audioausgabe erkannt",
     "Audio Output": "Audioausgabe",
-    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "In verschlüsselten Räumen, wie diesem, ist die Link-Vorschau standardmäßig deaktiviert damit dein Heimserver (auf dem die Vorschau erzeugt wird) keine Informationen über Links in diesem Raum bekommt.",
-    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "Wenn jemand eine URL in seine Nachricht einfügt, kann eine URL-Vorschau angezeigt werden, um mehr Informationen über diesen Link zu erhalten, wie z.B. den Titel, die Beschreibung und ein Bild von der Website.",
+    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "In verschlüsselten Räumen wie diesem ist die Link-Vorschau standardmäßig deaktiviert, damit dein Heimserver (der die Vorschau erzeugt) keine Informationen über Links in diesem Raum bekommt.",
+    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "Wenn jemand eine URL sendet, kann die Vorschau Informationen wie Titel, Beschreibung oder ein Vorschaubild enthalten.",
     "The email field must not be blank.": "Das E-Mail-Feld darf nicht leer sein.",
     "The phone number field must not be blank.": "Das Telefonnummern-Feld darf nicht leer sein.",
     "The password field must not be blank.": "Das Passwort-Feld darf nicht leer sein.",
     "Call in Progress": "Gespräch läuft",
     "A call is already in progress!": "Ein Gespräch läuft bereits!",
     "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Du kannst keine Nachrichten senden bis du <consentLink>unsere Geschäftsbedingungen</consentLink> gelesen und akzeptiert hast.",
-    "Demote yourself?": "Selbst zurückstufen?",
+    "Demote yourself?": "Dein eigenes Berechtigungslevel herabsetzen?",
     "Demote": "Zurückstufen",
     "This event could not be displayed": "Dieses Ereignis konnte nicht angezeigt werden",
     "A call is currently being placed!": "Ein Anruf wurde schon gestartet!",
@@ -837,7 +837,7 @@
     "You do not have permission to start a conference call in this room": "Du hast keine Berechtigung, ein Konferenzgespräch in diesem Raum zu starten",
     "Failed to remove widget": "Widget konnte nicht entfernt werden",
     "An error ocurred whilst trying to remove the widget from the room": "Ein Fehler trat auf während versucht wurde, das Widget aus diesem Raum zu entfernen",
-    "System Alerts": "System-Benachrichtigung",
+    "System Alerts": "Systembenachrichtigung",
     "Only room administrators will see this warning": "Nur Raum-Administratoren werden diese Nachricht sehen",
     "Please <a>contact your service administrator</a> to continue using the service.": "Bitte <a>kontaktiere deinen Systemadministrator</a> um diesen Dienst weiter zu nutzen.",
     "This homeserver has hit its Monthly Active User limit.": "Dieser Heimserver hat sein Limit an monatlich aktiven Nutzern erreicht.",
@@ -856,7 +856,7 @@
     "This room has been replaced and is no longer active.": "Dieser Raum wurde ersetzt und ist nicht länger aktiv.",
     "The conversation continues here.": "Die Konversation wird hier fortgesetzt.",
     "This room is a continuation of another conversation.": "Dieser Raum ist eine Fortsetzung einer anderen Konversation.",
-    "Click here to see older messages.": "Klicke hier um ältere Nachrichten zu sehen.",
+    "Click here to see older messages.": "Klicke hier, um ältere Nachrichten zu sehen.",
     "Failed to upgrade room": "Konnte Raum nicht aufrüsten",
     "The room upgrade could not be completed": "Die Raum-Aufrüstung konnte nicht fertiggestellt werden",
     "Upgrade this room to version %(version)s": "Diesen Raum zur Version %(version)s aufrüsten",
@@ -938,7 +938,7 @@
     "Don't ask again": "Nicht erneut fragen",
     "Set up": "Einrichten",
     "Please review and accept all of the homeserver's policies": "Bitte prüfe und akzeptiere alle Richtlinien des Heimservers",
-    "Failed to load group members": "Konnte Gruppenmitglieder nicht laden",
+    "Failed to load group members": "Gruppenmitglieder konnten nicht geladen werden",
     "That doesn't look like a valid email address": "Sieht nicht nach einer gültigen E-Mail-Adresse aus",
     "Unable to load commit detail: %(msg)s": "Konnte Commit-Details nicht laden: %(msg)s",
     "Checking...": "Überprüfe...",
@@ -1115,8 +1115,8 @@
     "Missing media permissions, click the button below to request.": "Fehlende Medienberechtigungen. Drücke auf den Knopf unten, um sie anzufordern.",
     "Request media permissions": "Medienberechtigungen anfordern",
     "Main address": "Primäre Adresse",
-    "Room avatar": "Raum-Bild",
-    "Room Name": "Raum-Name",
+    "Room avatar": "Raumbild",
+    "Room Name": "Raumname",
     "Room Topic": "Raum-Thema",
     "Join": "Beitreten",
     "Waiting for partner to confirm...": "Warte auf Bestätigung des Gesprächspartners...",
@@ -1264,13 +1264,13 @@
     "Show hidden events in timeline": "Zeige versteckte Ereignisse in der Chronik",
     "Low bandwidth mode": "Modus für niedrige Bandbreite",
     "Reset": "Zurücksetzen",
-    "Joining room …": "Trete Raum bei …",
+    "Joining room …": "Raum beitreten …",
     "Rejecting invite …": "Einladung ablehnen…",
     "Sign Up": "Registrieren",
     "Sign In": "Anmelden",
     "Reason: %(reason)s": "Grund: %(reason)s",
     "Forget this room": "Diesen Raum entfernen",
-    "Do you want to join %(roomName)s?": "Möchtest du %(roomName)s betreten?",
+    "Do you want to join %(roomName)s?": "Möchtest du %(roomName)s beitreten?",
     "<userName/> invited you": "<userName/> hat dich eingeladen",
     "edited": "bearbeitet",
     "Edit message": "Nachricht bearbeiten",
@@ -1288,9 +1288,9 @@
     "Add room": "Raum hinzufügen",
     "Your profile": "Dein Profil",
     "Registration Successful": "Registrierung erfolgreich",
-    "Failed to revoke invite": "Einladung zurückziehen fehlgeschlagen",
+    "Failed to revoke invite": "Einladung konnte nicht zurückgezogen werden",
     "Revoke invite": "Einladung zurückziehen",
-    "Invited by %(sender)s": "Eingeladen von %(sender)s",
+    "Invited by %(sender)s": "%(sender)s eingeladen",
     "Changes your avatar in all rooms": "Verändert dein Profilbild in allen Räumen",
     "Messages": "Nachrichten",
     "Actions": "Aktionen",
@@ -1439,7 +1439,7 @@
     "Set a new custom sound": "Setze einen neuen benutzerdefinierten Ton",
     "Browse": "Durchsuchen",
     "Direct Messages": "Direktnachrichten",
-    "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "Du kannst <code>/help</code> benutzen, um verfügbare Befehle aufzulisten. Willst du dies als Nachricht senden?",
+    "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "Du kannst <code>/help</code> benutzen, um alle verfügbaren Befehle aufzulisten. Willst du es stattdessen als Nachricht senden?",
     "Direct message": "Direktnachricht",
     "Suggestions": "Vorschläge",
     "Recently Direct Messaged": "Kürzlich direkt verschickt",
@@ -1515,8 +1515,8 @@
     "Messages in this room are not end-to-end encrypted.": "Nachrichten in diesem Raum sind nicht Ende-zu-Ende verschlüsselt.",
     "Security": "Sicherheit",
     "Ask %(displayName)s to scan your code:": "Bitte %(displayName)s, deinen Code zu scannen:",
-    "Verify by emoji": "Verifizierung durch Emojis",
-    "Verify by comparing unique emoji.": "Verifizierung durch den Vergleich einzigartiger Emojis.",
+    "Verify by emoji": "Mit Emojis verifizieren",
+    "Verify by comparing unique emoji.": "Durch den Vergleich einzigartiger Emojis verifizieren.",
     "You've successfully verified %(displayName)s!": "Du hast %(displayName)s erfolgreich verifiziert!",
     "Got it": "Verstanden",
     "Widget added by": "Widget hinzugefügt von",
@@ -1544,8 +1544,8 @@
     "Discovery options will appear once you have added an email above.": "Entdeckungsoptionen werden angezeigt, sobald oben eine E-Mail hinzugefügt wurde.",
     "Discovery options will appear once you have added a phone number above.": "Entdeckungsoptionen werden angezeigt, sobald eine Telefonnummer hinzugefügt wurde.",
     "Close preview": "Vorschau schließen",
-    "Loading room preview": "Lade Raumvorschau",
-    "Join the discussion": "Tritt der Diskussion bei",
+    "Loading room preview": "Raumvorschau wird geladen",
+    "Join the discussion": "Der Diskussion beitreten",
     "Remove for everyone": "Für alle entfernen",
     "Remove for me": "Für mich entfernen",
     "Create your Matrix account on <underlinedServerName />": "Erstelle dein Matrix-Konto auf <underlinedServerName />",
@@ -1553,12 +1553,12 @@
     "Your Matrix account on <underlinedServerName />": "Dein Matrix-Konto auf <underlinedServerName />",
     "Remove %(email)s?": "%(email)s entfernen?",
     "Remove %(phone)s?": "%(phone)s entfernen?",
-    "Remove recent messages by %(user)s": "Letzte Nachrichten von %(user)s entfernen",
-    "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|other": "Du bist dabei %(count)s Nachrichten von %(user)s zu löschen, was nicht rückgängig gemacht werden kann. Fortfahren?",
+    "Remove recent messages by %(user)s": "Kürzlich gesendete Nachrichten von %(user)s entfernen",
+    "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|other": "Du bist dabei, %(count)s Nachrichten von %(user)s zu löschen, was nicht rückgängig gemacht werden kann. Fortfahren?",
     "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|one": "Du bist dabei, eine Nachricht von %(user)s zu löschen. Das kann nicht rückgängig gemacht werden. Fortfahren?",
     "Remove %(count)s messages|other": "%(count)s Nachrichten entfernen",
     "Remove %(count)s messages|one": "Eine Nachricht entfernen",
-    "Remove recent messages": "Letzte Nachrichten entfernen",
+    "Remove recent messages": "Kürzlich gesendete Nachrichten entfernen",
     "You're previewing %(roomName)s. Want to join it?": "Du betrachtest %(roomName)s. Willst du beitreten?",
     "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s hat die alternative Adresse 2%(addresses)s für diesen Raum hinzugefügt.",
     "%(senderName)s changed the addresses for this room.": "%(senderName)s hat die Adresse für diesen Raum geändert.",
@@ -1603,9 +1603,9 @@
     "Upgrade the room": "Raum hochstufen",
     "Enable room encryption": "Raumverschlüsselung aktivieren",
     "This message cannot be decrypted": "Diese Nachricht kann nicht entschlüsselt werden",
-    "Encrypted by an unverified session": "Verschlüsselt von einer nicht verifizierten Sitzung",
+    "Encrypted by an unverified session": "Von einer nicht verifizierten Sitzung verschlüsselt",
     "Unencrypted": "Unverschlüsselt",
-    "Encrypted by a deleted session": "Verschlüsselt von einer gelöschten Sitzung",
+    "Encrypted by a deleted session": "Von einer gelöschten Sitzung verschlüsselt",
     "The encryption used by this room isn't supported.": "Die von diesem Raum verwendete Verschlüsselung wird nicht unterstützt.",
     "React": "Reagieren",
     "e.g. my-room": "z.B. mein-raum",
@@ -1670,7 +1670,7 @@
     "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 anzeigen",
     "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Achtung</b>: Du solltest die Schlüsselsicherung nur von einem vertrauenswürdigen Computer aus 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?",
@@ -1792,16 +1792,16 @@
     "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…",
+    "Failed to deactivate user": "Benutzer konnte nicht deaktiviert werden",
+    "Send a reply…": "Antwort senden…",
+    "Send a message…": "Nachricht senden…",
     "Bold": "Fett",
     "Italics": "Kursiv",
     "Strikethrough": "Durchgestrichen",
     "Code block": "Code-Block",
     "Recent rooms": "Letzte Räume",
     "Loading …": "Lade …",
-    "Join the conversation with an account": "Tritt der Unterhaltung mit einem Konto bei",
+    "Join the conversation with an account": "Unterhaltung mit einem Konto beitreten",
     "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",
@@ -1809,16 +1809,16 @@
     "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": "Dennoch versuchen beizutreten",
-    "You can still join it because this is a public room.": "Du kannst dennoch beitreten, da es ein öffentlicher Raum ist.",
+    "You can still join it because this is a public room.": "Du kannst trotzdem beitreten, weil es 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 %(brand)s.": "Verbinde diese E-Mail-Adresse in den Einstellungen mit deinem Konto um die Einladungen direkt in %(brand)s zu erhalten.",
+    "Link this email with your account in Settings to receive invites directly in %(brand)s.": "Verbinde diese E-Mail-Adresse in den Einstellungen mit deinem Konto, um die Einladungen direkt in %(brand)s 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 %(brand)s.": "Verknüpfe einen Identitätsserver in den Einstellungen um die Einladungen direkt in %(brand)s zu erhalten.",
-    "Share this email in Settings to receive invites directly in %(brand)s.": "Teile diese E-Mail-Adresse in den Einstellungen um Einladungen direkt in %(brand)s zu erhalten.",
+    "Share this email in Settings to receive invites directly in %(brand)s.": "Teile diese E-Mail-Adresse in den Einstellungen, um Einladungen direkt in %(brand)s zu erhalten.",
     "%(roomName)s can't be previewed. Do you want to join it?": "Vorschau von %(roomName)s kann nicht angezeigt 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 zu prüfen, ob du berechtigt bist.",
-    "%(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 wurde, beim Versuch den Raum zu betreten, zurückgegeben. Wenn du denkst dass diese Meldung nicht korrekt ist, <issueLink>erstelle bitte einen Fehlerbericht</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 wurde beim Versuch den Raum zu betreten, zurückgegeben. Wenn du denkst dass diese Meldung nicht korrekt ist, <issueLink>erstelle bitte einen Fehlerbericht</issueLink>.",
     "%(count)s unread messages including mentions.|other": "%(count)s ungelesene Nachrichten einschließlich Erwähnungen.",
     "%(count)s unread messages including mentions.|one": "1 ungelesene Erwähnung.",
     "%(count)s unread messages.|other": "%(count)s ungelesene Nachrichten.",
@@ -1838,16 +1838,16 @@
     "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",
+    "No other published addresses yet, add one below": "Keine anderen öffentlichen Adressen vorhanden. Du kannst weiter unten eine hinzufügen",
     "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",
+    "Start Verification": "Verifizierung starten",
     "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.",
+    "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 könnt sie lesen.",
     "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": "Nutzer verifizieren",
     "For extra security, verify this user by checking a one-time code on both of your devices.": "Für zusätzliche Sicherheit, verifiziere diesen Nutzer, durch Vergleichen eines Einmal-Codes auf euren beiden Geräten.",
@@ -1859,10 +1859,10 @@
     "Yours, or the other users’ session": "Deine Sitzung oder die des Gegenüber",
     "<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.",
-    "Verify by scanning": "Verifizierung durch QR-Code-Scannen",
+    "Verify by scanning": "Verifizierung durch Scannen eines QR-Codes",
     "If you can't scan the code above, verify by comparing unique emoji.": "Wenn du den obigen Code nicht scannen kannst, verifiziere stattdessen durch den Emoji-Vergleich.",
     "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.",
+    "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.",
@@ -1872,7 +1872,7 @@
     "%(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",
+    "Compare emoji": "Emojis vergleichen",
     "Message Actions": "Nachrichtenaktionen",
     "Show image": "Bild anzeigen",
     "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>",
@@ -1882,16 +1882,16 @@
     "Accepting …": "Annehmen …",
     "Declining …": "Ablehnen …",
     "You sent a verification request": "Du hast eine Verifizierungsanfrage gesendet",
-    "Show all": "Alle zeigen",
+    "Show all": "Alles 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",
+    "Edited at %(date)s. Click to view edits.": "Am %(date)s geändert. Klicke, um Änderungen anzuzeigen.",
+    "Can't load this message": "Diese Nachricht kann nicht geladen werden",
+    "Submit logs": "Log-Dateien senden",
+    "Frequently Used": "Oft verwendet",
     "Smileys & People": "Smileys & Leute",
     "Animals & Nature": "Tiere & Natur",
     "Food & Drink": "Essen & Trinken",
@@ -1900,9 +1900,9 @@
     "Objects": "Objekte",
     "Symbols": "Symbole",
     "Flags": "Flaggen",
-    "Quick Reactions": "Praktische Reaktionen",
+    "Quick Reactions": "Schnelle Reaktionen",
     "Cancel search": "Suche abbrechen",
-    "Any of the following data may be shared:": "Die folgenden Daten können geteilt werden:",
+    "Any of the following data may be shared:": "Die folgenden Informationen können geteilt werden:",
     "Your avatar URL": "Deine Avatar-URL",
     "Your user ID": "Deine Nutzer-ID",
     "Your theme": "Dein Design",
@@ -2212,10 +2212,10 @@
     "New version available. <a>Update now.</a>": "Neue Version verfügbar. <a>Jetzt aktualisieren.</a>",
     "Please verify the room ID or address and try again.": "Bitte überprüfe die Raum-ID oder -adresse und versuche es erneut.",
     "To link to this room, please add an address.": "Um den Raum zu verlinken, füge bitte eine Adresse hinzu.",
-    "Emoji picker": "Emoji Auswahl",
+    "Emoji picker": "Emojiauswahl",
     "Error creating address": "Fehler beim Anlegen der Adresse",
     "There was an error creating that address. It may not be allowed by the server or a temporary failure occurred.": "Es gab einen Fehler beim Anlegen der Adresse. Entweder erlaubt es der Server nicht oder es gab ein temporäres Problem.",
-    "You don't have permission to delete the address.": "Du hast nicht die Berechtigung die Adresse zu löschen.",
+    "You don't have permission to delete the address.": "Du hast nicht die Berechtigung, die Adresse zu löschen.",
     "Error removing address": "Fehler beim Löschen der Adresse",
     "Categories": "Kategorien",
     "Room address": "Raumadresse",
@@ -2227,7 +2227,7 @@
     "Use a different passphrase?": "Eine andere Passphrase verwenden?",
     "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "Deine Server-Administration hat die Ende-zu-Ende-Verschlüsselung für private Räume und Direktnachrichten standardmäßig deaktiviert.",
     "People": "Personen",
-    "There was an error removing that address. It may no longer exist or a temporary error occurred.": "Beim Entfernen dieser Adresse ist ein Fehler aufgetreten. Vielleicht existiert diese nicht mehr oder es kam zu einem temporären Fehler.",
+    "There was an error removing that address. It may no longer exist or a temporary error occurred.": "Beim Entfernen dieser Adresse ist ein Fehler aufgetreten. Vielleicht existiert sie nicht mehr oder es kam zu einem temporären Fehler.",
     "Set a room address to easily share your room with other people.": "Vergebe eine Raum-Adresse, um diesen Raum auf einfache Weise mit anderen Personen teilen zu können.",
     "You've previously used a newer version of %(brand)s with this session. To use this version again with end to end encryption, you will need to sign out and back in again.": "Du hast für diese Sitzung zuvor eine neuere Version von %(brand)s verwendet. Um diese Version mit Ende-zu-Ende-Verschlüsselung wieder zu benutzen, musst du dich erst ab- und dann wieder anmelden.",
     "Delete the room address %(alias)s and remove %(name)s from the directory?": "Soll die Raum-Adresse %(alias)s gelöscht und %(name)s aus dem Raum-Verzeichnis entfernt werden?",
@@ -2245,9 +2245,9 @@
     "Show": "Zeige",
     "Message preview": "Nachrichtenvorschau",
     "List options": "Optionen anzeigen",
-    "Show %(count)s more|other": "Zeige %(count)s weitere",
-    "Show %(count)s more|one": "Zeige %(count)s weitere",
-    "Leave Room": "Verlasse Raum",
+    "Show %(count)s more|other": "%(count)s weitere anzeigen",
+    "Show %(count)s more|one": "%(count)s weitere anzeigen",
+    "Leave Room": "Raum verlassen",
     "Room options": "Raumoptionen",
     "Activity": "Aktivität",
     "A-Z": "A-Z",
@@ -2349,15 +2349,15 @@
     "Show rooms with unread messages first": "Räume mit ungelesenen Nachrichten zuerst zeigen",
     "Show previews of messages": "Nachrichtenvorschau anzeigen",
     "Use default": "Standardeinstellungen benutzen",
-    "Mentions & Keywords": "Erwähnungen & Schlüsselwörter",
+    "Mentions & Keywords": "Erwähnungen und Schlüsselwörter",
     "Notification options": "Benachrichtigungsoptionen",
     "Forget Room": "Raum vergessen",
     "Favourited": "Favorisiert",
     "This room is public": "Dieser Raum ist öffentlich",
     "Away": "Abwesend",
-    "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what %(brand)s supports. Try with a different client.": "Die Sitzung, die du verifizieren möchtest, unterstützt weder das scannen eines QR-Codes noch eine Emoji-Verifikation, welche von %(brand)s unterstützt werden. Versuche es mit einer anderen Anwendung.",
+    "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what %(brand)s supports. Try with a different client.": "Die Sitzung, die du verifizieren möchtest, unterstützt weder das scannen eines QR-Codes noch eine Emoji-Verifikation, welche von %(brand)s unterstützt werden. Versuche es mit einem anderen Client.",
     "Edited at %(date)s": "Geändert am %(date)s",
-    "Click to view edits": "Klicke um Änderungen anzuzeigen",
+    "Click to view edits": "Klicke, um Änderungen anzuzeigen",
     "%(brand)s encountered an error during upload of:": "%(brand)s hat einen Fehler festgestellt beim hochladen von:",
     "Use your account to sign in to the latest version of the app at <a />": "Verwende dein Konto um dich an der neusten Version der App anzumelden<a />",
     "We’re excited to announce Riot is now Element!": "Wir freuen uns bekanntzugeben: Riot ist jetzt Element!",
@@ -2460,7 +2460,7 @@
     "Prepends ( ͡° ͜ʖ ͡°) to a plain-text message": "Stellt ( ͡° ͜ʖ ͡°) einer Klartextnachricht voran",
     "Unknown App": "Unbekannte App",
     "%(count)s results|one": "%(count)s Ergebnis",
-    "Room Info": "Raum-Info",
+    "Room Info": "Rauminfo",
     "Apps": "Apps",
     "Unpin app": "App nicht mehr anheften",
     "Edit apps, bridges & bots": "Apps, Bridges & Bots bearbeiten",
@@ -2507,8 +2507,8 @@
     "Unable to set up keys": "Schlüssel können nicht eingerichtet werden",
     "Use the <a>Desktop app</a> to see all encrypted files": "Nutze die <a>Desktop-App</a> um alle verschlüsselten Dateien zu sehen",
     "Use the <a>Desktop app</a> to search encrypted messages": "Nutze die <a>Desktop-App</a> um verschlüsselte Nachrichten zu suchen",
-    "This version of %(brand)s does not support viewing some encrypted files": "Diese Version von %(brand)s unterstützt nicht alle verschlüsselten Dateien anzuzeigen",
-    "This version of %(brand)s does not support searching encrypted messages": "Diese Version von %(brand)s unterstützt nicht verschlüsselte Nachrichten zu durchsuchen",
+    "This version of %(brand)s does not support viewing some encrypted files": "Diese Version von %(brand)s kann nicht alle verschlüsselten Dateien anzuzeigen",
+    "This version of %(brand)s does not support searching encrypted messages": "Diese Version von %(brand)s kann verschlüsselte Nachrichten nicht durchsuchen",
     "Cannot create rooms in this community": "Räume können in dieser Community nicht erstellt werden",
     "You do not have permission to create rooms in this community.": "Du bist nicht berechtigt Räume in dieser Community zu erstellen.",
     "End conference": "Konferenzgespräch beenden",
@@ -2530,7 +2530,7 @@
     "Move left": "Nach links schieben",
     "Revoke permissions": "Berechtigungen widerrufen",
     "Unpin a widget to view it in this panel": "Widget nicht mehr anheften, um es in diesem Bereich anzuzeigen",
-    "You can only pin up to %(count)s widgets|other": "Du kannst nur bis zu %(count)s Widgets anheften",
+    "You can only pin up to %(count)s widgets|other": "Du kannst nur %(count)s Widgets anheften",
     "Show Widgets": "Widgets anzeigen",
     "Hide Widgets": "Widgets verstecken",
     "%(senderName)s declined the call.": "%(senderName)s hat den Anruf abgelehnt.",
@@ -2621,19 +2621,19 @@
     "Call Paused": "Anruf pausiert",
     "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "Verschlüsselte Nachrichten sicher lokal zwischenspeichern, um sie in Suchergebnissen finden zu können. Es werden %(size)s benötigt, um die Nachrichten von %(rooms)s Räumen zu speichern.",
     "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "Verschlüsselte Nachrichten sicher lokal zwischenspeichern, um sie in Suchergebnissen finden zu können. Es werden %(size)s benötigt, um die Nachrichten vom Raum %(rooms)s zu speichern.",
-    "Only the two of you are in this conversation, unless either of you invites anyone to join.": "Nur ihr zwei seid in dieser Konversation, außer einer von euch lädt jemanden neues ein.",
-    "This is the beginning of your direct message history with <displayName/>.": "Dies ist der Beginn deiner Direktnachrichtenhistorie mit <displayName/>.",
+    "Only the two of you are in this conversation, unless either of you invites anyone to join.": "Nur ihr zwei seid in dieser Konversation, außer ihr lädt jemanden neues ein.",
+    "This is the beginning of your direct message history with <displayName/>.": "Dies ist der Beginn deiner Direktnachrichten mit <displayName/>.",
     "Topic: %(topic)s (<a>edit</a>)": "Thema: %(topic)s (<a>ändern</a>)",
     "Topic: %(topic)s ": "Thema: %(topic)s ",
-    "<a>Add a topic</a> to help people know what it is about.": "<a>Füge ein Thema hinzu</a> um Personen zu verdeutlichen um was es in ihm geht.",
+    "<a>Add a topic</a> to help people know what it is about.": "<a>Füge ein Thema hinzu</a>, um Personen zu verdeutlichen um was es in ihm geht.",
     "You created this room.": "Du hast diesen Raum erstellt.",
-    "%(displayName)s created this room.": "%(displayName)s erstellte diesen Raum.",
+    "%(displayName)s created this room.": "%(displayName)s hat diesen Raum erstellt.",
     "Add a photo, so people can easily spot your room.": "Füge ein Foto hinzu, sodass Personen deinen Raum einfach finden können.",
     "This is the start of <roomName/>.": "Dies ist der Beginn von <roomName/>.",
     "Start a new chat": "Starte einen neuen Chat",
     "Role": "Rolle",
     "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.": "Nachrichten hier sind Ende-zu-Ende-verschlüsselt. Verifiziere %(displayName)s im deren Profil - klicke auf deren Avatar.",
-    "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "Nachrichten in diesem Raum sind Ende-zu-Ende-verschlüsselt. Wenn Personen beitreten, kannst du sie in ihrem Profil verifizieren, klicke hierfür auf deren Avatar.",
+    "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "Nachrichten in diesem Raum sind Ende-zu-Ende-verschlüsselt. Wenn Personen beitreten, kannst du sie in ihrem Profil verifizieren, indem du auf deren Avatar klickst.",
     "Tell us below how you feel about %(brand)s so far.": "Erzähle uns wie %(brand)s dir soweit gefällt.",
     "Please go into as much detail as you like, so we can track down the problem.": "Bitte nenne so viele Details wie du möchtest, sodass wir das Problem finden können.",
     "Comment": "Kommentar",
@@ -3023,7 +3023,7 @@
     "Access your secure message history and set up secure messaging by entering your Security Key.": "Greife auf deinen sicheren Chatverlauf zu und richte die sichere Nachrichtenübermittlung ein, indem du deinen Sicherheitsschlüssel eingibst.",
     "If you've forgotten your Security Phrase you can <button1>use your Security Key</button1> or <button2>set up new recovery options</button2>": "Wenn du deine Sicherheitsphrase vergessen hast, kannst du <button1>deinen Sicherheitsschlüssel nutzen</button1> oder <button2>neue Wiederherstellungsoptionen einrichten</button2>",
     "Security Key mismatch": "Nicht übereinstimmende Sicherheitsschlüssel",
-    "Set my room layout for everyone": "Setze mein Raum-Layout für alle",
+    "Set my room layout for everyone": "Dieses Raum-Layout für alle setzen",
     "%(senderName)s has updated the widget layout": "%(senderName)s hat das Widget-Layout aktualisiert",
     "Search (must be enabled)": "Suche (muss aktiviert sein)",
     "Remember this": "Dies merken",
@@ -3045,7 +3045,7 @@
     "We couldn't log you in": "Wir konnten dich nicht anmelden",
     "Windows": "Fenster",
     "Screens": "Bildschirme",
-    "Share your screen": "Deinen Bildschirm teilen",
+    "Share your screen": "Bildschirm teilen",
     "Recently visited rooms": "Kürzlich besuchte Räume",
     "Show line numbers in code blocks": "Zeilennummern in Code-Blöcken anzeigen",
     "Expand code blocks by default": "Code-Blöcke standardmäßig erweitern",
@@ -3112,5 +3112,9 @@
     "You're already in a call with this person.": "Du bist schon in einem Anruf mit dieser Person.",
     "Already in call": "Schon im Anruf",
     "Invite people": "Personen einladen",
-    "Jump to the bottom of the timeline when you send a message": "Nach dem Senden einer Nachricht im Chatverlauf nach unten scrollen"
+    "Jump to the bottom of the timeline when you send a message": "Nach dem Senden einer Nachricht im Chatverlauf nach unten scrollen",
+    "Empty room": "Leerer Raum",
+    "Your message was sent": "Die Nachricht wurde gesendet",
+    "Encrypting your message...": "Nachricht wird verschlüsselt...",
+    "Sending your message...": "Nachricht wird gesendet..."
 }

From 60efd3c4c09269426772d04df127ed2de18020d0 Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Fri, 19 Mar 2021 16:51:01 +0000
Subject: [PATCH 366/420] Translated using Weblate (German)

Currently translated at 96.7% (2794 of 2889 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-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 22f27823a6..174c60170f 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1800,7 +1800,7 @@
     "Strikethrough": "Durchgestrichen",
     "Code block": "Code-Block",
     "Recent rooms": "Letzte Räume",
-    "Loading …": "Lade …",
+    "Loading …": "Laden …",
     "Join the conversation with an account": "Unterhaltung mit einem Konto beitreten",
     "You were kicked from %(roomName)s by %(memberName)s": "Du wurdest von %(memberName)s aus %(roomName)s entfernt",
     "Re-join": "Wieder beitreten",

From 90c3ca3a2e6cfb93bc4eee0b3ea7e0bc3f08967c Mon Sep 17 00:00:00 2001
From: rkfg <rkfg@rkfg.me>
Date: Fri, 19 Mar 2021 11:36:03 +0000
Subject: [PATCH 367/420] Translated using Weblate (Russian)

Currently translated at 95.6% (2763 of 2889 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-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 7cbcb08167..e7c8c2b4d7 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -96,7 +96,7 @@
     "Failure to create room": "Не удалось создать комнату",
     "%(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.",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s пригласил(а) %(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 покинул(а) комнату.",
@@ -2613,7 +2613,7 @@
     "Unable to validate homeserver": "Невозможно проверить домашний сервер",
     "Sign into your homeserver": "Войдите на свой домашний сервер",
     "with state key %(stateKey)s": "с ключом состояния %(stateKey)s",
-    "%(creator)s created this DM.": "%(creator)s начал этот чат.",
+    "%(creator)s created this DM.": "%(creator)s начал(а) этот чат.",
     "Show chat effects": "Показать эффекты чата",
     "Host account on": "Ваша учётная запись обслуживается",
     "%(ssoButtons)s Or %(usernamePassword)s": "%(ssoButtons)s или %(usernamePassword)s",

From 90b8a6647689e52cd183db91866cfc02ce810a8e Mon Sep 17 00:00:00 2001
From: Tawfiek <tawfiek.108@gmail.com>
Date: Sun, 21 Mar 2021 14:11:45 +0200
Subject: [PATCH 368/420] fix make btns in verify dailog respect system font

---
 res/css/_common.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/res/css/_common.scss b/res/css/_common.scss
index 36a81e6651..0093bde0ab 100644
--- a/res/css/_common.scss
+++ b/res/css/_common.scss
@@ -395,6 +395,7 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
     border: 1px solid $accent-color;
     color: $accent-color;
     background-color: $button-secondary-bg-color;
+    font-family: inherit;
 }
 
 .mx_Dialog button:last-child {

From f5911e6446a430003243ed359664b6f5a7d8e6ec Mon Sep 17 00:00:00 2001
From: Ayush PS <ayushpratap16@gmail.com>
Date: Mon, 22 Mar 2021 00:33:09 +0530
Subject: [PATCH 369/420] Fixing the minor UI issues in the email discovery

---
 src/components/views/settings/discovery/EmailAddresses.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/views/settings/discovery/EmailAddresses.js b/src/components/views/settings/discovery/EmailAddresses.js
index 0493597537..b8d91aae2a 100644
--- a/src/components/views/settings/discovery/EmailAddresses.js
+++ b/src/components/views/settings/discovery/EmailAddresses.js
@@ -203,6 +203,7 @@ export class EmailAddress extends React.Component {
                     className="mx_ExistingEmailAddress_confirmBtn"
                     kind="primary_sm"
                     onClick={this.onContinueClick}
+                    disabled={this.state.continueDisabled}
                 >
                     {_t("Complete")}
                 </AccessibleButton>

From 497caf5645874d5614eb43d220dc8a18eda6149f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 22 Mar 2021 13:22:16 +0000
Subject: [PATCH 370/420] Fix redaction event list summaries breaking sender
 profiles

---
 src/components/structures/MessagePanel.js | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 63f23f22f3..0a9af413d8 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -1044,6 +1044,10 @@ class RedactionGrouper {
     }
 
     shouldGroup(ev) {
+        // absorb hidden events so that they do not break up streams of messages & redaction events being grouped
+        if (!this.panel._shouldShowEvent(ev)) {
+            return true;
+        }
         if (this.panel._wantsDateSeparator(this.events[0], ev.getDate())) {
             return false;
         }
@@ -1055,6 +1059,9 @@ class RedactionGrouper {
             ev.getId(),
             ev === this.lastShownEvent,
         );
+        if (!this.panel._shouldShowEvent(ev)) {
+            return;
+        }
         this.events.push(ev);
     }
 
@@ -1080,13 +1087,9 @@ class RedactionGrouper {
         );
 
         const senders = new Set();
-        let eventTiles = this.events.map((e) => {
+        let eventTiles = this.events.map((e, i) => {
             senders.add(e.sender);
-            // In order to prevent DateSeparators from appearing in the expanded form,
-            // 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);
+            return panel._getTilesForEvent(i === 0 ? this.prevEvent : this.events[i - 1], e, e === lastShownEvent);
         }).reduce((a, b) => a.concat(b), []);
 
         if (eventTiles.length === 0) {

From cfbcf12e1d6ffe5fa078976182cd847faf4c2530 Mon Sep 17 00:00:00 2001
From: Germain Souquet <germain@souquet.com>
Date: Mon, 22 Mar 2021 15:02:28 +0000
Subject: [PATCH 371/420] docs: update file extensions in CIDER editor
 documentation

---
 docs/ciderEditor.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/ciderEditor.md b/docs/ciderEditor.md
index f522dc2fc4..379b6f5b51 100644
--- a/docs/ciderEditor.md
+++ b/docs/ciderEditor.md
@@ -21,14 +21,14 @@ caret nodes (more on that later).
 For these reasons it doesn't use `innerText`, `textContent` or anything similar.
 The model addresses any content in the editor within as an offset within this string.
 The caret position is thus also converted from a position in the DOM tree
-to an offset in the content string. This happens in `getCaretOffsetAndText` in `dom.js`.
+to an offset in the content string. This happens in `getCaretOffsetAndText` in `dom.ts`.
 
 Once the content string and caret offset is calculated, it is passed to the `update()`
 method of the model. The model first calculates the same content string of its current parts,
 basically just concatenating their text. It then looks for differences between
 the current and the new content string. The diffing algorithm is very basic,
 and assumes there is only one change around the caret offset,
-so this should be very inexpensive. See `diff.js` for details.
+so this should be very inexpensive. See `diff.ts` for details.
 
 The result of the diffing is the strings that were added and/or removed from
 the current content. These differences are then applied to the parts,
@@ -51,7 +51,7 @@ which relate poorly to text input or changes, and don't need the `beforeinput` e
 which isn't broadly supported yet.
 
 Once the parts of the model are updated, the DOM of the editor is then reconciled
-with the new model state, see `renderModel` in `render.js` for this.
+with the new model state, see `renderModel` in `render.ts` for this.
 If the model didn't reject the input and didn't make any additional changes,
 this won't make any changes to the DOM at all, and should thus be fairly efficient.
 

From 0db31dfeaeb656418c5f2690eb73a3b13ded285c Mon Sep 17 00:00:00 2001
From: Germain Souquet <germain@souquet.com>
Date: Mon, 22 Mar 2021 15:05:22 +0000
Subject: [PATCH 372/420] fix: CIDER formatting buttons on Safari

---
 res/css/views/rooms/_MessageComposerFormatBar.scss     | 2 ++
 src/components/views/rooms/MessageComposerFormatBar.js | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/res/css/views/rooms/_MessageComposerFormatBar.scss b/res/css/views/rooms/_MessageComposerFormatBar.scss
index d97c49630a..b305e91db0 100644
--- a/res/css/views/rooms/_MessageComposerFormatBar.scss
+++ b/res/css/views/rooms/_MessageComposerFormatBar.scss
@@ -60,6 +60,8 @@ limitations under the License.
         width: 27px;
         height: 24px;
         box-sizing: border-box;
+        background: none;
+        vertical-align: middle;
     }
 
     .mx_MessageComposerFormatBar_button::after {
diff --git a/src/components/views/rooms/MessageComposerFormatBar.js b/src/components/views/rooms/MessageComposerFormatBar.js
index d2539b1ef4..fc0f785b08 100644
--- a/src/components/views/rooms/MessageComposerFormatBar.js
+++ b/src/components/views/rooms/MessageComposerFormatBar.js
@@ -85,8 +85,8 @@ class FormatButton extends React.PureComponent {
 
         return (
             <AccessibleTooltipButton
-                as="span"
-                role="button"
+                element="button"
+                type="button"
                 onClick={this.props.onClick}
                 title={this.props.label}
                 tooltip={tooltip}

From 2818cdf3d4bf3ad990317c7629b063a40261642e Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 22 Mar 2021 17:46:50 +0000
Subject: [PATCH 373/420] Fix space hierarchy exploding when encountering an
 empty subspace

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

diff --git a/src/components/structures/SpaceRoomDirectory.tsx b/src/components/structures/SpaceRoomDirectory.tsx
index 0a53f38238..ab273887c2 100644
--- a/src/components/structures/SpaceRoomDirectory.tsx
+++ b/src/components/structures/SpaceRoomDirectory.tsx
@@ -260,7 +260,7 @@ export const HierarchyLevel = ({
     const space = cli.getRoom(spaceId);
     const hasPermissions = space?.currentState.maySendStateEvent(EventType.SpaceChild, cli.getUserId())
 
-    const sortedChildren = sortBy([...relations.get(spaceId)?.values()], ev => ev.content.order || null);
+    const sortedChildren = sortBy([...(relations.get(spaceId)?.values() || [])], ev => ev.content.order || null);
     const [subspaces, childRooms] = sortedChildren.reduce((result, ev: ISpaceSummaryEvent) => {
         const roomId = ev.state_key;
         if (!rooms.has(roomId)) return result;

From 796bfd851de39878ae8d082a9a3eb72f3d53cd1a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 22 Mar 2021 17:47:48 +0000
Subject: [PATCH 374/420] Fix left spaces not disappearing from the space panel

---
 src/stores/SpaceStore.tsx | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/stores/SpaceStore.tsx b/src/stores/SpaceStore.tsx
index b82acfd0ed..dba3f1d8a9 100644
--- a/src/stores/SpaceStore.tsx
+++ b/src/stores/SpaceStore.tsx
@@ -196,13 +196,16 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
     };
 
     public rebuild = throttle(() => { // exported for tests
-        const visibleRooms = this.matrixClient.getVisibleRooms();
+        // get all most-upgraded rooms & spaces except spaces which have been left (historical)
+        const visibleRooms = this.matrixClient.getVisibleRooms().filter(r => {
+            return !r.isSpaceRoom() || r.getMyMembership() === "join";
+        });
+
+        const unseenChildren = new Set<Room>(visibleRooms);
+        const backrefs = new EnhancedMap<string, Set<string>>();
 
         // Sort spaces by room ID to force the loop breaking to be deterministic
-        const spaces = sortBy(this.getSpaces(), space => space.roomId);
-        const unseenChildren = new Set<Room>([...visibleRooms, ...spaces]);
-
-        const backrefs = new EnhancedMap<string, Set<string>>();
+        const spaces = sortBy(visibleRooms.filter(r => r.isSpaceRoom()), space => space.roomId);
 
         // TODO handle cleaning up links when a Space is removed
         spaces.forEach(space => {

From d5b115dd084c94fcfe301ee15ca8cdc9269eb84f Mon Sep 17 00:00:00 2001
From: Hubert Chathi <hubert@uhoreg.ca>
Date: Mon, 22 Mar 2021 19:52:09 -0400
Subject: [PATCH 375/420] don't overwrite callback with undefined if no
 customization provided

---
 src/MatrixClientPeg.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/MatrixClientPeg.ts b/src/MatrixClientPeg.ts
index de1d573d40..7db5ed1a4e 100644
--- a/src/MatrixClientPeg.ts
+++ b/src/MatrixClientPeg.ts
@@ -296,10 +296,11 @@ class _MatrixClientPeg implements IMatrixClientPeg {
         // These are always installed regardless of the labs flag so that
         // cross-signing features can toggle on without reloading and also be
         // accessed immediately after login.
-        const customisedCallbacks = {
-            getDehydrationKey: SecurityCustomisations.getDehydrationKey,
-        };
-        Object.assign(opts.cryptoCallbacks, crossSigningCallbacks, customisedCallbacks);
+        Object.assign(opts.cryptoCallbacks, crossSigningCallbacks);
+        if (SecurityCustomisations.getDehydrationKey) {
+            opts.cryptoCallbacks.getDehydrationKey =
+                SecurityCustomisations.getDehydrationKey;
+        }
 
         this.matrixClient = createMatrixClient(opts);
 

From e352ed19085c76522a5963e89594cd09bfb18c9a Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 22 Mar 2021 19:32:24 -0600
Subject: [PATCH 376/420] Run audio through the Web Audio API instead

This leads to more reliable frequency/timing information, and involves a whole lot less decoding.

We still maintain ongoing encoded frames to avoid having to do one giant encode at the end, as that could take long enough to be disruptive.
---
 .../views/rooms/VoiceRecordComposerTile.tsx   |   4 +-
 src/voice/VoiceRecorder.ts                    | 101 +++++++++++++-----
 2 files changed, 79 insertions(+), 26 deletions(-)

diff --git a/src/components/views/rooms/VoiceRecordComposerTile.tsx b/src/components/views/rooms/VoiceRecordComposerTile.tsx
index a1d0e8c12f..7327bf2380 100644
--- a/src/components/views/rooms/VoiceRecordComposerTile.tsx
+++ b/src/components/views/rooms/VoiceRecordComposerTile.tsx
@@ -58,8 +58,8 @@ export default class VoiceRecordComposerTile extends React.PureComponent<IProps,
         await recorder.start();
         this.props.onRecording(true);
         // TODO: @@ TravisR: Run through EQ component
-        // recorder.rawData.onUpdate((frame) => {
-        //     console.log('@@ FRAME', frame);
+        // recorder.frequencyData.onUpdate((freq) => {
+        //     console.log('@@ UPDATE', freq);
         // });
         this.setState({recorder});
     };
diff --git a/src/voice/VoiceRecorder.ts b/src/voice/VoiceRecorder.ts
index 3d1008d45e..5646b53cbe 100644
--- a/src/voice/VoiceRecorder.ts
+++ b/src/voice/VoiceRecorder.ts
@@ -20,40 +20,74 @@ import {MatrixClient} from "matrix-js-sdk/src/client";
 import CallMediaHandler from "../CallMediaHandler";
 import {SimpleObservable} from "matrix-widget-api";
 
+const CHANNELS = 1; // stereo isn't important
+const SAMPLE_RATE = 48000; // 48khz is what WebRTC uses. 12khz is where we lose quality.
+const BITRATE = 64000; // 64kbps is average for WebRTC, so we might as well use it too.
+const FREQ_SAMPLE_RATE = 4; // Target rate of frequency data. We don't need this super often.
+
+export interface IFrequencyPackage {
+    dbBars: Float32Array;
+    dbMin: number;
+    dbMax: number;
+
+    // TODO: @@ TravisR: Generalize this for a timing package?
+}
+
 export class VoiceRecorder {
-    private recorder = new Recorder({
-        encoderPath, // magic from webpack
-        mediaTrackConstraints: <MediaTrackConstraints>{
-            deviceId: CallMediaHandler.getAudioInput(),
-        },
-        encoderSampleRate: 48000, // we could go down to 12khz, but we lose quality. 48khz is a webrtc default
-        encoderApplication: 2048, // voice (default is "audio")
-        streamPages: true, // so we can have a live EQ for the user
-        encoderFrameSize: 20, // ms, we want updates fairly regularly for the UI
-        numberOfChannels: 1, // stereo isn't important for us
-        //sourceNode: instanceof MediaStreamAudioSourceNode, // TODO: @@ Travis: Use this for EQ stuff.
-        encoderBitRate: 64000, // 64kbps is average for webrtc
-        encoderComplexity: 3, // 0-10, 0 is fast and low complexity
-        resampleQuality: 3, // 0-10, 10 is slow and high quality
-    });
+    private recorder: Recorder;
+    private recorderContext: AudioContext;
+    private recorderSource: MediaStreamAudioSourceNode;
+    private recorderStream: MediaStream;
+    private recorderFreqNode: AnalyserNode;
     private buffer = new Uint8Array(0);
     private mxc: string;
     private recording = false;
-    private observable: SimpleObservable<Uint8Array>;
+    private observable: SimpleObservable<IFrequencyPackage>;
+    private freqTimerId: number;
 
     public constructor(private client: MatrixClient) {
+    }
+
+    private async makeRecorder() {
+        this.recorderStream = await navigator.mediaDevices.getUserMedia({
+            audio: {
+                // specify some audio settings so we're feeding the recorder with the
+                // best possible values. The browser will handle resampling for us.
+                sampleRate: SAMPLE_RATE,
+                channelCount: CHANNELS,
+                noiseSuppression: true, // browsers ignore constraints they can't honour
+                deviceId: CallMediaHandler.getAudioInput(),
+            },
+        });
+        this.recorderContext = new AudioContext({
+            latencyHint: "interactive",
+            sampleRate: SAMPLE_RATE, // once again, the browser will resample for us
+        });
+        this.recorderSource = this.recorderContext.createMediaStreamSource(this.recorderStream);
+        this.recorderFreqNode = this.recorderContext.createAnalyser();
+        this.recorderSource.connect(this.recorderFreqNode);
+        this.recorder = new Recorder({
+            encoderPath, // magic from webpack
+            encoderSampleRate: SAMPLE_RATE,
+            encoderApplication: 2048, // voice (default is "audio")
+            streamPages: true, // this speeds up the encoding process by using CPU over time
+            encoderFrameSize: 20, // ms, arbitrary frame size we send to the encoder
+            numberOfChannels: CHANNELS,
+            sourceNode: this.recorderSource,
+            encoderBitRate: BITRATE,
+            encoderComplexity: 3, // 0-10, 0 is fast and low complexity
+            resampleQuality: 3, // 0-10, 10 is slow and high quality
+        });
         this.recorder.ondataavailable = (a: ArrayBuffer) => {
-            // TODO: @@ TravisR: We'll have to decode each frame and convert it to an EQ to observe
             const buf = new Uint8Array(a);
             const newBuf = new Uint8Array(this.buffer.length + buf.length);
             newBuf.set(this.buffer, 0);
             newBuf.set(buf, this.buffer.length);
             this.buffer = newBuf;
-            this.observable.update(buf); // send the frame over the observable
         };
     }
 
-    public get rawData(): SimpleObservable<Uint8Array> {
+    public get frequencyData(): SimpleObservable<IFrequencyPackage> {
         if (!this.recording) throw new Error("No observable when not recording");
         return this.observable;
     }
@@ -83,7 +117,18 @@ export class VoiceRecorder {
         if (this.observable) {
             this.observable.close();
         }
-        this.observable = new SimpleObservable<Uint8Array>();
+        this.observable = new SimpleObservable<IFrequencyPackage>();
+        await this.makeRecorder();
+        this.freqTimerId = setInterval(() => {
+            if (!this.recording) return;
+            const data = new Float32Array(this.recorderFreqNode.frequencyBinCount);
+            this.recorderFreqNode.getFloatFrequencyData(data);
+            this.observable.update({
+                dbBars: data,
+                dbMin: this.recorderFreqNode.minDecibels,
+                dbMax: this.recorderFreqNode.maxDecibels,
+            });
+        }, 1000 / FREQ_SAMPLE_RATE) as any as number; // XXX: Linter doesn't understand timer environment
         return this.recorder.start().then(() => this.recording = true);
     }
 
@@ -91,12 +136,20 @@ export class VoiceRecorder {
         if (!this.recording) {
             throw new Error("No recording to stop");
         }
-        return new Promise<Uint8Array>(resolve => {
-            this.recorder.stop().then(() => {
+        // Disconnect the source early to start shutting down resources
+        this.recorderSource.disconnect();
+        return this.recorder.stop()
+            // close the context after the recorder so the recorder doesn't try to
+            // connect anything to the context (this would generate a warning)
+            .then(() => this.recorderContext.close())
+            // Now stop all the media tracks so we can release them back to the user/OS
+            .then(() => this.recorderStream.getTracks().forEach(t => t.stop()))
+            // Finally do our post-processing and clean up
+            .then(() => {
+                clearInterval(<number>this.freqTimerId);
                 this.recording = false;
                 return this.recorder.close();
-            }).then(() => resolve(this.buffer));
-        });
+            }).then(() => this.buffer);
     }
 
     public async upload(): Promise<string> {

From 090cf28af497678ce7ebaa132b01112228faa5a2 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 22 Mar 2021 19:36:58 -0600
Subject: [PATCH 377/420] Appease the linter

---
 src/voice/VoiceRecorder.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/voice/VoiceRecorder.ts b/src/voice/VoiceRecorder.ts
index 5646b53cbe..ec1a745272 100644
--- a/src/voice/VoiceRecorder.ts
+++ b/src/voice/VoiceRecorder.ts
@@ -146,7 +146,7 @@ export class VoiceRecorder {
             .then(() => this.recorderStream.getTracks().forEach(t => t.stop()))
             // Finally do our post-processing and clean up
             .then(() => {
-                clearInterval(<number>this.freqTimerId);
+                clearInterval(this.freqTimerId);
                 this.recording = false;
                 return this.recorder.close();
             }).then(() => this.buffer);

From 026aa6f88d76bc404b0b2789b9599bbf0af59f59 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 22 Mar 2021 21:39:07 -0600
Subject: [PATCH 378/420] Track next event [tile] over group boundaries

Fixes https://github.com/vector-im/element-web/issues/16745
---
 src/components/structures/MessagePanel.js | 38 +++++++++++++++--------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 0a9af413d8..6951aff357 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -452,6 +452,20 @@ export default class MessagePanel extends React.Component {
         });
     };
 
+    _getNextEventInfo(arr, i) {
+        const nextEvent = i < arr.length - 1
+            ? arr[i + 1]
+            : null;
+
+        // The next event with tile is used to to determine the 'last successful' flag
+        // when rendering the tile. The shouldShowEvent function is pretty quick at what
+        // it does, so this should have no significant cost even when a room is used for
+        // not-chat purposes.
+        const nextTile = arr.slice(i + 1).find(e => this._shouldShowEvent(e));
+
+        return {nextEvent, nextTile};
+    }
+
     _getEventTiles() {
         this.eventNodes = {};
 
@@ -503,6 +517,7 @@ export default class MessagePanel extends React.Component {
             const mxEv = this.props.events[i];
             const eventId = mxEv.getId();
             const last = (mxEv === lastShownEvent);
+            const {nextEvent, nextTile} = this._getNextEventInfo(this.props.events, i);
 
             if (grouper) {
                 if (grouper.shouldGroup(mxEv)) {
@@ -519,21 +534,13 @@ export default class MessagePanel extends React.Component {
 
             for (const Grouper of groupers) {
                 if (Grouper.canStartGroup(this, mxEv)) {
-                    grouper = new Grouper(this, mxEv, prevEvent, lastShownEvent);
+                    grouper = new Grouper(this, mxEv, prevEvent, lastShownEvent, nextEvent, nextTile);
                 }
             }
             if (!grouper) {
                 const wantTile = this._shouldShowEvent(mxEv);
                 if (wantTile) {
-                    const nextEvent = i < this.props.events.length - 1
-                        ? this.props.events[i + 1]
-                        : null;
-
-                    // The next event with tile is used to to determine the 'last successful' flag
-                    // when rendering the tile. The shouldShowEvent function is pretty quick at what
-                    // it does, so this should have no significant cost even when a room is used for
-                    // not-chat purposes.
-                    const nextTile = this.props.events.slice(i + 1).find(e => this._shouldShowEvent(e));
+                    const {nextEvent, nextTile} = this._getNextEventInfo(this.props.events, i);
 
                     // make sure we unpack the array returned by _getTilesForEvent,
                     // otherwise react will auto-generate keys and we will end up
@@ -982,7 +989,7 @@ class CreationGrouper {
             ));
         }
 
-        const eventTiles = this.events.map((e) => {
+        const eventTiles = this.events.map((e, i) => {
             // In order to prevent DateSeparators from appearing in the expanded form
             // of EventListSummary, render each member event as if the previous
             // one was itself. This way, the timestamp of the previous event === the
@@ -1032,7 +1039,7 @@ class RedactionGrouper {
         return panel._shouldShowEvent(ev) && ev.isRedacted();
     }
 
-    constructor(panel, ev, prevEvent, lastShownEvent) {
+    constructor(panel, ev, prevEvent, lastShownEvent, nextEvent, nextEventTile) {
         this.panel = panel;
         this.readMarker = panel._readMarkerForEvent(
             ev.getId(),
@@ -1041,6 +1048,8 @@ class RedactionGrouper {
         this.events = [ev];
         this.prevEvent = prevEvent;
         this.lastShownEvent = lastShownEvent;
+        this.nextEvent = nextEvent;
+        this.nextEventTile = nextEventTile;
     }
 
     shouldGroup(ev) {
@@ -1089,7 +1098,10 @@ class RedactionGrouper {
         const senders = new Set();
         let eventTiles = this.events.map((e, i) => {
             senders.add(e.sender);
-            return panel._getTilesForEvent(i === 0 ? this.prevEvent : this.events[i - 1], e, e === lastShownEvent);
+            return panel._getTilesForEvent(
+                i === 0 ? this.prevEvent : this.events[i - 1],
+                e, e === lastShownEvent,
+                this.nextEvent, this.nextEventTile);
         }).reduce((a, b) => a.concat(b), []);
 
         if (eventTiles.length === 0) {

From fa54ca615a48cda4ff64357bb12b87b6b6871cce Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 22 Mar 2021 21:41:13 -0600
Subject: [PATCH 379/420] Appease the linter

---
 src/components/structures/MessagePanel.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 6951aff357..671d895a21 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -989,7 +989,7 @@ class CreationGrouper {
             ));
         }
 
-        const eventTiles = this.events.map((e, i) => {
+        const eventTiles = this.events.map((e) => {
             // In order to prevent DateSeparators from appearing in the expanded form
             // of EventListSummary, render each member event as if the previous
             // one was itself. This way, the timestamp of the previous event === the
@@ -1098,10 +1098,8 @@ class RedactionGrouper {
         const senders = new Set();
         let eventTiles = this.events.map((e, i) => {
             senders.add(e.sender);
-            return panel._getTilesForEvent(
-                i === 0 ? this.prevEvent : this.events[i - 1],
-                e, e === lastShownEvent,
-                this.nextEvent, this.nextEventTile);
+            const prevEvent = i === 0 ? this.prevEvent : this.events[i - 1];
+            return panel._getTilesForEvent(prevEvent, e, e === lastShownEvent, this.nextEvent, this.nextEventTile);
         }).reduce((a, b) => a.concat(b), []);
 
         if (eventTiles.length === 0) {

From 1f6f9ca9838b830f33a8e364c21e405f97eda434 Mon Sep 17 00:00:00 2001
From: Germain Souquet <germain@souquet.com>
Date: Tue, 23 Mar 2021 18:24:05 +0000
Subject: [PATCH 380/420] Only show the ask anyway modal for explicit user
 lookup failures

---
 src/utils/MultiInviter.js | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/utils/MultiInviter.js b/src/utils/MultiInviter.js
index 63d3942b37..05fa06ee14 100644
--- a/src/utils/MultiInviter.js
+++ b/src/utils/MultiInviter.js
@@ -111,17 +111,10 @@ export default class MultiInviter {
             }
 
             if (!ignoreProfile && SettingsStore.getValue("promptBeforeInviteUnknownUsers", this.roomId)) {
-                try {
-                    const profile = await MatrixClientPeg.get().getProfileInfo(addr);
-                    if (!profile) {
-                        // noinspection ExceptionCaughtLocallyJS
-                        throw new Error("User has no profile");
-                    }
-                } catch (e) {
-                    throw {
-                        errcode: "RIOT.USER_NOT_FOUND",
-                        error: "User does not have a profile or does not exist."
-                    };
+                const profile = await MatrixClientPeg.get().getProfileInfo(addr);
+                if (!profile) {
+                    // noinspection ExceptionCaughtLocallyJS
+                    throw new Error("User has no profile");
                 }
             }
 

From b8692bdf175ce27e78bfb27102ef61445b947503 Mon Sep 17 00:00:00 2001
From: Germain Souquet <germain@souquet.com>
Date: Tue, 23 Mar 2021 18:25:03 +0000
Subject: [PATCH 381/420] Prevent state to be toggled whilst a request is
 pending

---
 src/components/views/dialogs/InviteDialog.tsx | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/components/views/dialogs/InviteDialog.tsx b/src/components/views/dialogs/InviteDialog.tsx
index de0b5b237b..4ea53349bd 100644
--- a/src/components/views/dialogs/InviteDialog.tsx
+++ b/src/components/views/dialogs/InviteDialog.tsx
@@ -886,19 +886,21 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
     };
 
     _toggleMember = (member: Member) => {
-        let filterText = this.state.filterText;
-        const targets = this.state.targets.map(t => t); // cheap clone for mutation
-        const idx = targets.indexOf(member);
-        if (idx >= 0) {
-            targets.splice(idx, 1);
-        } else {
-            targets.push(member);
-            filterText = ""; // clear the filter when the user accepts a suggestion
-        }
-        this.setState({targets, filterText});
+        if (!this.state.busy) {
+            let filterText = this.state.filterText;
+            const targets = this.state.targets.map(t => t); // cheap clone for mutation
+            const idx = targets.indexOf(member);
+            if (idx >= 0) {
+                targets.splice(idx, 1);
+            } else {
+                targets.push(member);
+                filterText = ""; // clear the filter when the user accepts a suggestion
+            }
+            this.setState({targets, filterText});
 
-        if (this._editorRef && this._editorRef.current) {
-            this._editorRef.current.focus();
+            if (this._editorRef && this._editorRef.current) {
+                this._editorRef.current.focus();
+            }
         }
     };
 

From 2f2bb9456ff2757e752fa3f8910706b8ebfac14c Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 23 Mar 2021 18:17:41 -0600
Subject: [PATCH 382/420] Reduce code duplication

---
 src/components/structures/MessagePanel.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 671d895a21..6d03c849c4 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -540,8 +540,6 @@ export default class MessagePanel extends React.Component {
             if (!grouper) {
                 const wantTile = this._shouldShowEvent(mxEv);
                 if (wantTile) {
-                    const {nextEvent, nextTile} = this._getNextEventInfo(this.props.events, i);
-
                     // make sure we unpack the array returned by _getTilesForEvent,
                     // otherwise react will auto-generate keys and we will end up
                     // replacing all of the DOM elements every time we paginate.

From b7e653268b6c8e41fd22db365813b586beba1fbb Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 23 Mar 2021 18:19:14 -0600
Subject: [PATCH 383/420] Rename function

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

diff --git a/src/components/views/rooms/VoiceRecordComposerTile.tsx b/src/components/views/rooms/VoiceRecordComposerTile.tsx
index 7327bf2380..0d381001a1 100644
--- a/src/components/views/rooms/VoiceRecordComposerTile.tsx
+++ b/src/components/views/rooms/VoiceRecordComposerTile.tsx
@@ -40,7 +40,7 @@ export default class VoiceRecordComposerTile extends React.PureComponent<IProps,
         };
     }
 
-    private onStartVoiceMessage = async () => {
+    private onStartStopVoiceMessage = async () => {
         // TODO: @@ TravisR: We do not want to auto-send on stop.
         if (this.state.recorder) {
             await this.state.recorder.stop();
@@ -80,7 +80,7 @@ export default class VoiceRecordComposerTile extends React.PureComponent<IProps,
         return (
             <AccessibleTooltipButton
                 className={classes}
-                onClick={this.onStartVoiceMessage}
+                onClick={this.onStartStopVoiceMessage}
                 title={tooltip}
             />
         );

From c9938ff704765414ad119e0ea42822d96eefc23f Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 23 Mar 2021 18:24:40 -0600
Subject: [PATCH 384/420] Adjust settings/docs for encoder

---
 src/voice/VoiceRecorder.ts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/voice/VoiceRecorder.ts b/src/voice/VoiceRecorder.ts
index ec1a745272..9fa2faad1e 100644
--- a/src/voice/VoiceRecorder.ts
+++ b/src/voice/VoiceRecorder.ts
@@ -22,8 +22,8 @@ import {SimpleObservable} from "matrix-widget-api";
 
 const CHANNELS = 1; // stereo isn't important
 const SAMPLE_RATE = 48000; // 48khz is what WebRTC uses. 12khz is where we lose quality.
-const BITRATE = 64000; // 64kbps is average for WebRTC, so we might as well use it too.
-const FREQ_SAMPLE_RATE = 4; // Target rate of frequency data. We don't need this super often.
+const BITRATE = 24000; // 24kbps is pretty high quality for our use case in opus.
+const FREQ_SAMPLE_RATE = 4; // Target rate of frequency data (samples / sec). We don't need this super often.
 
 export interface IFrequencyPackage {
     dbBars: Float32Array;
@@ -75,7 +75,11 @@ export class VoiceRecorder {
             numberOfChannels: CHANNELS,
             sourceNode: this.recorderSource,
             encoderBitRate: BITRATE,
-            encoderComplexity: 3, // 0-10, 0 is fast and low complexity
+
+            // We use low values for the following to ease CPU usage - the resulting waveform
+            // is indistinguishable for a voice message. Note that the underlying library will
+            // pick defaults which prefer the highest possible quality, CPU be damned.
+            encoderComplexity: 3, // 0-10, 10 is slow and high quality.
             resampleQuality: 3, // 0-10, 10 is slow and high quality
         });
         this.recorder.ondataavailable = (a: ArrayBuffer) => {

From d929d4839154927c415110ea89db90160fe934dc Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 23 Mar 2021 18:26:43 -0600
Subject: [PATCH 385/420] Clean up promises

---
 src/voice/VoiceRecorder.ts | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/voice/VoiceRecorder.ts b/src/voice/VoiceRecorder.ts
index 9fa2faad1e..06c0d939fc 100644
--- a/src/voice/VoiceRecorder.ts
+++ b/src/voice/VoiceRecorder.ts
@@ -133,27 +133,32 @@ export class VoiceRecorder {
                 dbMax: this.recorderFreqNode.maxDecibels,
             });
         }, 1000 / FREQ_SAMPLE_RATE) as any as number; // XXX: Linter doesn't understand timer environment
-        return this.recorder.start().then(() => this.recording = true);
+        await this.recorder.start();
+        this.recording = true;
     }
 
     public async stop(): Promise<Uint8Array> {
         if (!this.recording) {
             throw new Error("No recording to stop");
         }
+
         // Disconnect the source early to start shutting down resources
         this.recorderSource.disconnect();
-        return this.recorder.stop()
-            // close the context after the recorder so the recorder doesn't try to
-            // connect anything to the context (this would generate a warning)
-            .then(() => this.recorderContext.close())
-            // Now stop all the media tracks so we can release them back to the user/OS
-            .then(() => this.recorderStream.getTracks().forEach(t => t.stop()))
-            // Finally do our post-processing and clean up
-            .then(() => {
-                clearInterval(this.freqTimerId);
-                this.recording = false;
-                return this.recorder.close();
-            }).then(() => this.buffer);
+        await this.recorder.stop();
+
+        // close the context after the recorder so the recorder doesn't try to
+        // connect anything to the context (this would generate a warning)
+        await this.recorderContext.close();
+
+        // Now stop all the media tracks so we can release them back to the user/OS
+        this.recorderStream.getTracks().forEach(t => t.stop());
+
+        // Finally do our post-processing and clean up
+        clearInterval(this.freqTimerId);
+        this.recording = false;
+        await this.recorder.close();
+
+        return this.buffer;
     }
 
     public async upload(): Promise<string> {

From d836ca19d86fc65c4bea99a50de37f0958b036af Mon Sep 17 00:00:00 2001
From: Germain Souquet <germain@souquet.com>
Date: Wed, 24 Mar 2021 08:58:08 +0000
Subject: [PATCH 386/420] remove references to disused RIOT.USER_NOT_FOUND
 error code

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

diff --git a/src/utils/MultiInviter.js b/src/utils/MultiInviter.js
index 05fa06ee14..3d3a5f4137 100644
--- a/src/utils/MultiInviter.js
+++ b/src/utils/MultiInviter.js
@@ -164,7 +164,7 @@ export default class MultiInviter {
                         this._doInvite(address, ignoreProfile).then(resolve, reject);
                     }, 5000);
                     return;
-                } else if (['M_NOT_FOUND', 'M_USER_NOT_FOUND', 'RIOT.USER_NOT_FOUND'].includes(err.errcode)) {
+                } else if (['M_NOT_FOUND', 'M_USER_NOT_FOUND'].includes(err.errcode)) {
                     errorText = _t("User %(user_id)s does not exist", {user_id: address});
                 } else if (err.errcode === 'M_PROFILE_UNDISCLOSED') {
                     errorText = _t("User %(user_id)s may or may not exist", {user_id: address});
@@ -205,7 +205,7 @@ export default class MultiInviter {
             if (Object.keys(this.errors).length > 0 && !this.groupId) {
                 // There were problems inviting some people - see if we can invite them
                 // without caring if they exist or not.
-                const unknownProfileErrors = ['M_NOT_FOUND', 'M_USER_NOT_FOUND', 'M_PROFILE_UNDISCLOSED', 'M_PROFILE_NOT_FOUND', 'RIOT.USER_NOT_FOUND'];
+                const unknownProfileErrors = ['M_NOT_FOUND', 'M_USER_NOT_FOUND', 'M_PROFILE_UNDISCLOSED', 'M_PROFILE_NOT_FOUND'];
                 const unknownProfileUsers = Object.keys(this.errors).filter(a => unknownProfileErrors.includes(this.errors[a].errcode));
 
                 if (unknownProfileUsers.length > 0) {

From 5104d7bed85f744f3cd6d72635712eed0e23b983 Mon Sep 17 00:00:00 2001
From: Germain Souquet <germain@souquet.com>
Date: Wed, 24 Mar 2021 11:51:39 +0000
Subject: [PATCH 387/420] Improve error reporting when EventIndex fails on a
 supported environment

---
 .../views/settings/EventIndexPanel.js         | 19 ++++++++++++++++++-
 src/i18n/strings/en_EN.json                   |  1 +
 src/indexing/EventIndexPeg.js                 |  2 ++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/components/views/settings/EventIndexPanel.js b/src/components/views/settings/EventIndexPanel.js
index d78b99fc5d..a48583b61d 100644
--- a/src/components/views/settings/EventIndexPanel.js
+++ b/src/components/views/settings/EventIndexPanel.js
@@ -190,7 +190,7 @@ export default class EventIndexPanel extends React.Component {
                     }
                 </div>
             );
-        } else {
+        } else if (!EventIndexPeg.platformHasSupport()) {
             eventIndexingSettings = (
                 <div className='mx_SettingsTab_subsectionText'>
                     {
@@ -208,6 +208,23 @@ export default class EventIndexPanel extends React.Component {
                     }
                 </div>
             );
+        } else {
+            eventIndexingSettings = (
+                <div className='mx_SettingsTab_subsectionText'>
+                    <p>
+                        {_t("Message search initilisation failed")}
+                    </p>
+                    {EventIndexPeg.error && (
+                    <details>
+                        <summary>{_t("Advanced")}</summary>
+                        <code>
+                            {EventIndexPeg.error.message}
+                        </code>
+                    </details>
+                    )}
+
+                </div>
+            );
         }
 
         return eventIndexingSettings;
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 5f1003bf29..f0d7922836 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1081,6 +1081,7 @@
     "Securely cache encrypted messages locally for them to appear in search results.": "Securely cache encrypted messages locally for them to appear in search results.",
     "%(brand)s is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom %(brand)s Desktop with <nativeLink>search components added</nativeLink>.": "%(brand)s is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom %(brand)s Desktop with <nativeLink>search components added</nativeLink>.",
     "%(brand)s can't securely cache encrypted messages locally while running in a web browser. Use <desktopLink>%(brand)s Desktop</desktopLink> for encrypted messages to appear in search results.": "%(brand)s can't securely cache encrypted messages locally while running in a web browser. Use <desktopLink>%(brand)s Desktop</desktopLink> for encrypted messages to appear in search results.",
+    "Message search initilisation failed": "Message search initilisation failed",
     "Connecting to integration manager...": "Connecting to integration manager...",
     "Cannot connect to integration manager": "Cannot connect to integration manager",
     "The integration manager is offline or it cannot reach your homeserver.": "The integration manager is offline or it cannot reach your homeserver.",
diff --git a/src/indexing/EventIndexPeg.js b/src/indexing/EventIndexPeg.js
index 443daa8f43..7004efc554 100644
--- a/src/indexing/EventIndexPeg.js
+++ b/src/indexing/EventIndexPeg.js
@@ -31,6 +31,7 @@ class EventIndexPeg {
     constructor() {
         this.index = null;
         this._supportIsInstalled = false;
+        this.error = null;
     }
 
     /**
@@ -96,6 +97,7 @@ class EventIndexPeg {
             await index.init();
         } catch (e) {
             console.log("EventIndex: Error initializing the event index", e);
+            this.error = e;
             return false;
         }
 

From fb46815b6a5bbc2b17286f67b3fef70af53111bc Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 24 Mar 2021 13:15:31 +0000
Subject: [PATCH 388/420] Spaces move away from Form Buttons

---
 res/css/structures/_SpaceRoomView.scss        |  2 +-
 .../views/dialogs/_SpaceSettingsDialog.scss   |  2 +-
 res/css/views/spaces/_SpaceCreateMenu.scss    |  2 +-
 src/components/structures/SpaceRoomView.tsx   | 41 ++++++++++++-------
 .../dialogs/AddExistingToSpaceDialog.tsx      |  9 ++--
 .../views/dialogs/SpaceSettingsDialog.tsx     | 12 +++---
 .../views/spaces/SpaceCreateMenu.tsx          |  9 ++--
 7 files changed, 44 insertions(+), 33 deletions(-)

diff --git a/res/css/structures/_SpaceRoomView.scss b/res/css/structures/_SpaceRoomView.scss
index a7ce630b96..080773b49b 100644
--- a/res/css/structures/_SpaceRoomView.scss
+++ b/res/css/structures/_SpaceRoomView.scss
@@ -89,7 +89,7 @@ $SpaceRoomViewInnerWidth: 428px;
             width: $SpaceRoomViewInnerWidth;
             text-align: right; // button alignment right
 
-            .mx_FormButton {
+            .mx_AccessibleButton_hasKind {
                 padding: 8px 22px;
                 margin-left: 16px;
             }
diff --git a/res/css/views/dialogs/_SpaceSettingsDialog.scss b/res/css/views/dialogs/_SpaceSettingsDialog.scss
index c1fa539e9b..6e5fd9c8c8 100644
--- a/res/css/views/dialogs/_SpaceSettingsDialog.scss
+++ b/res/css/views/dialogs/_SpaceSettingsDialog.scss
@@ -49,7 +49,7 @@ limitations under the License.
         }
     }
 
-    .mx_FormButton {
+    .mx_AccessibleButton_hasKind {
         padding: 8px 22px;
     }
 }
diff --git a/res/css/views/spaces/_SpaceCreateMenu.scss b/res/css/views/spaces/_SpaceCreateMenu.scss
index bea39e2389..ef3fea351b 100644
--- a/res/css/views/spaces/_SpaceCreateMenu.scss
+++ b/res/css/views/spaces/_SpaceCreateMenu.scss
@@ -79,7 +79,7 @@ $spacePanelWidth: 71px;
             }
         }
 
-        .mx_FormButton {
+        .mx_AccessibleButton_kind_primary {
             padding: 8px 22px;
             margin-left: auto;
             display: block;
diff --git a/src/components/structures/SpaceRoomView.tsx b/src/components/structures/SpaceRoomView.tsx
index 95846d8e21..46ff37dc14 100644
--- a/src/components/structures/SpaceRoomView.tsx
+++ b/src/components/structures/SpaceRoomView.tsx
@@ -26,7 +26,6 @@ import AccessibleButton from "../views/elements/AccessibleButton";
 import RoomName from "../views/elements/RoomName";
 import RoomTopic from "../views/elements/RoomTopic";
 import InlineSpinner from "../views/elements/InlineSpinner";
-import FormButton from "../views/elements/FormButton";
 import {inviteMultipleToRoom, showRoomInviteDialog} from "../../RoomInvite";
 import {useRoomMembers} from "../../hooks/useRoomMembers";
 import createRoom, {IOpts, Preset} from "../../createRoom";
@@ -124,30 +123,36 @@ const SpacePreview = ({ space, onJoinButtonClicked, onRejectButtonClicked }) =>
         }
 
         joinButtons = <>
-            <FormButton
-                label={_t("Reject")}
+            <AccessibleButton
                 kind="secondary"
                 onClick={() => {
                     setBusy(true);
                     onRejectButtonClicked();
-                }} />
-            <FormButton
-                label={_t("Accept")}
+                }}
+            >
+                { _t("Reject") }
+            </AccessibleButton>
+            <AccessibleButton
+                kind="primary"
                 onClick={() => {
                     setBusy(true);
                     onJoinButtonClicked();
                 }}
-            />
+            >
+                { _t("Accept") }
+            </AccessibleButton>
         </>;
     } else {
         joinButtons = (
-            <FormButton
-                label={_t("Join")}
+            <AccessibleButton
+                kind="primary"
                 onClick={() => {
                     setBusy(true);
                     onJoinButtonClicked();
                 }}
-            />
+            >
+                { _t("Join") }
+            </AccessibleButton>
         )
     }
 
@@ -407,11 +412,13 @@ const SpaceSetupFirstRooms = ({ space, title, description, onFinished }) => {
         { fields }
 
         <div className="mx_SpaceRoomView_buttons">
-            <FormButton
-                label={buttonLabel}
+            <AccessibleButton
+                kind="primary"
                 disabled={busy}
                 onClick={onClick}
-            />
+            >
+                { buttonLabel }
+            </AccessibleButton>
         </div>
     </div>;
 };
@@ -426,7 +433,9 @@ const SpaceSetupPublicShare = ({ space, onFinished }) => {
         <SpacePublicShare space={space} onFinished={onFinished} />
 
         <div className="mx_SpaceRoomView_buttons">
-            <FormButton label={_t("Go to my first room")} onClick={onFinished} />
+            <AccessibleButton kind="primary" onClick={onFinished}>
+                { _t("Go to my first room") }
+            </AccessibleButton>
         </div>
     </div>;
 };
@@ -545,7 +554,9 @@ const SpaceSetupPrivateInvite = ({ space, onFinished }) => {
         </div>
 
         <div className="mx_SpaceRoomView_buttons">
-            <FormButton label={buttonLabel} disabled={busy} onClick={onClick} />
+            <AccessibleButton kind="primary" disabled={busy} onClick={onClick}>
+                { buttonLabel }
+            </AccessibleButton>
         </div>
     </div>;
 };
diff --git a/src/components/views/dialogs/AddExistingToSpaceDialog.tsx b/src/components/views/dialogs/AddExistingToSpaceDialog.tsx
index 500637244a..e3e28e4fbe 100644
--- a/src/components/views/dialogs/AddExistingToSpaceDialog.tsx
+++ b/src/components/views/dialogs/AddExistingToSpaceDialog.tsx
@@ -22,7 +22,6 @@ import {MatrixClient} from "matrix-js-sdk/src/client";
 import {_t} from '../../../languageHandler';
 import {IDialogProps} from "./IDialogProps";
 import BaseDialog from "./BaseDialog";
-import FormButton from "../elements/FormButton";
 import Dropdown from "../elements/Dropdown";
 import SearchBox from "../../structures/SearchBox";
 import SpaceStore from "../../../stores/SpaceStore";
@@ -185,8 +184,8 @@ const AddExistingToSpaceDialog: React.FC<IProps> = ({ matrixClient: cli, space,
                 </AccessibleButton>
             </span>
 
-            <FormButton
-                label={busy ? _t("Applying...") : _t("Apply")}
+            <AccessibleButton
+                kind="primary"
                 disabled={busy || selectedToAdd.size < 1}
                 onClick={async () => {
                     setBusy(true);
@@ -200,7 +199,9 @@ const AddExistingToSpaceDialog: React.FC<IProps> = ({ matrixClient: cli, space,
                     }
                     setBusy(false);
                 }}
-            />
+            >
+                { busy ? _t("Adding...") : _t("Add") }
+            </AccessibleButton>
         </div>
     </BaseDialog>;
 };
diff --git a/src/components/views/dialogs/SpaceSettingsDialog.tsx b/src/components/views/dialogs/SpaceSettingsDialog.tsx
index f6bf5b87e6..b016e320eb 100644
--- a/src/components/views/dialogs/SpaceSettingsDialog.tsx
+++ b/src/components/views/dialogs/SpaceSettingsDialog.tsx
@@ -28,7 +28,6 @@ import {getTopic} from "../elements/RoomTopic";
 import {avatarUrlForRoom} from "../../../Avatar";
 import ToggleSwitch from "../elements/ToggleSwitch";
 import AccessibleButton from "../elements/AccessibleButton";
-import FormButton from "../elements/FormButton";
 import Modal from "../../../Modal";
 import defaultDispatcher from "../../../dispatcher/dispatcher";
 import {allSettled} from "../../../utils/promise";
@@ -134,16 +133,17 @@ const SpaceSettingsDialog: React.FC<IProps> = ({ matrixClient: cli, space, onFin
                 />
             </div>
 
-            <FormButton
+            <AccessibleButton
                 kind="danger"
-                label={_t("Leave Space")}
                 onClick={() => {
                     defaultDispatcher.dispatch({
                         action: "leave_room",
                         room_id: space.roomId,
                     });
                 }}
-            />
+            >
+                { _t("Leave Space") }
+            </AccessibleButton>
 
             <div className="mx_SpaceSettingsDialog_buttons">
                 <AccessibleButton onClick={() => Modal.createDialog(DevtoolsDialog, {roomId: space.roomId})}>
@@ -152,7 +152,9 @@ const SpaceSettingsDialog: React.FC<IProps> = ({ matrixClient: cli, space, onFin
                 <AccessibleButton onClick={onFinished} disabled={busy} kind="link">
                     { _t("Cancel") }
                 </AccessibleButton>
-                <FormButton onClick={onSave} disabled={busy} label={busy ? _t("Saving...") : _t("Save Changes")} />
+                <AccessibleButton onClick={onSave} disabled={busy} kind="primary">
+                    { busy ? _t("Saving...") : _t("Save Changes") }
+                </AccessibleButton>
             </div>
         </div>
     </BaseDialog>;
diff --git a/src/components/views/spaces/SpaceCreateMenu.tsx b/src/components/views/spaces/SpaceCreateMenu.tsx
index 879cf929e0..6269de1c50 100644
--- a/src/components/views/spaces/SpaceCreateMenu.tsx
+++ b/src/components/views/spaces/SpaceCreateMenu.tsx
@@ -21,7 +21,6 @@ import {EventType, RoomType, RoomCreateTypeField} from "matrix-js-sdk/src/@types
 import {_t} from "../../../languageHandler";
 import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
 import {ChevronFace, ContextMenu} from "../../structures/ContextMenu";
-import FormButton from "../elements/FormButton";
 import createRoom, {IStateEvent, Preset} from "../../../createRoom";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import SpaceBasicSettings from "./SpaceBasicSettings";
@@ -148,11 +147,9 @@ const SpaceCreateMenu = ({ onFinished }) => {
 
             <SpaceBasicSettings setAvatar={setAvatar} name={name} setName={setName} topic={topic} setTopic={setTopic} />
 
-            <FormButton
-                label={busy ? _t("Creating...") : _t("Create")}
-                onClick={onSpaceCreateClick}
-                disabled={!name && !busy}
-            />
+            <AccessibleButton kind="primary" onClick={onSpaceCreateClick} disabled={!name && !busy}>
+                { busy ? _t("Creating...") : _t("Create") }
+            </AccessibleButton>
         </React.Fragment>;
     }
 

From 4e9a2df3b0689e11dfb18241a5c8a86a6d6b4a2f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 24 Mar 2021 14:00:52 +0000
Subject: [PATCH 389/420] Spaces autofocus and prefill the search box

---
 src/components/structures/SearchBox.js                    | 5 ++++-
 src/components/structures/SpaceRoomDirectory.tsx          | 2 ++
 src/components/views/dialogs/AddExistingToSpaceDialog.tsx | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/SearchBox.js b/src/components/structures/SearchBox.js
index 6daa8526bc..abeb858274 100644
--- a/src/components/structures/SearchBox.js
+++ b/src/components/structures/SearchBox.js
@@ -32,6 +32,8 @@ export default class SearchBox extends React.Component {
         onKeyDown: PropTypes.func,
         className: PropTypes.string,
         placeholder: PropTypes.string.isRequired,
+        autoFocus: PropTypes.bool,
+        initialValue: PropTypes.string,
 
         // If true, the search box will focus and clear itself
         // on room search focus action (it would be nicer to take
@@ -49,7 +51,7 @@ export default class SearchBox extends React.Component {
         this._search = createRef();
 
         this.state = {
-            searchTerm: "",
+            searchTerm: this.props.initialValue || "",
             blurred: true,
         };
     }
@@ -158,6 +160,7 @@ export default class SearchBox extends React.Component {
                     onBlur={this._onBlur}
                     placeholder={ placeholder }
                     autoComplete="off"
+                    autoFocus={this.props.autoFocus}
                 />
                 { clearButton }
             </div>
diff --git a/src/components/structures/SpaceRoomDirectory.tsx b/src/components/structures/SpaceRoomDirectory.tsx
index ab273887c2..2fb0101f88 100644
--- a/src/components/structures/SpaceRoomDirectory.tsx
+++ b/src/components/structures/SpaceRoomDirectory.tsx
@@ -570,6 +570,8 @@ const SpaceRoomDirectory: React.FC<IProps> = ({ space, initialText = "", onFinis
                     className="mx_textinput_icon mx_textinput_search"
                     placeholder={ _t("Search names and description") }
                     onSearch={setQuery}
+                    autoFocus={true}
+                    initialValue={initialText}
                 />
 
                 { content }
diff --git a/src/components/views/dialogs/AddExistingToSpaceDialog.tsx b/src/components/views/dialogs/AddExistingToSpaceDialog.tsx
index e3e28e4fbe..fec1a178ca 100644
--- a/src/components/views/dialogs/AddExistingToSpaceDialog.tsx
+++ b/src/components/views/dialogs/AddExistingToSpaceDialog.tsx
@@ -127,6 +127,7 @@ const AddExistingToSpaceDialog: React.FC<IProps> = ({ matrixClient: cli, space,
             className="mx_textinput_icon mx_textinput_search"
             placeholder={ _t("Filter your rooms and spaces") }
             onSearch={setQuery}
+            autoComplete={true}
         />
         <AutoHideScrollbar className="mx_AddExistingToSpaceDialog_content" id="mx_AddExistingToSpaceDialog">
             { spaces.length > 0 ? (

From d8737913693551141841100554527e7515423e8f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 24 Mar 2021 14:01:24 +0000
Subject: [PATCH 390/420] update comments

---
 src/stores/SpaceStore.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/stores/SpaceStore.tsx b/src/stores/SpaceStore.tsx
index dba3f1d8a9..e4b537169e 100644
--- a/src/stores/SpaceStore.tsx
+++ b/src/stores/SpaceStore.tsx
@@ -195,7 +195,7 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
         return this.spaceFilteredRooms.get(space?.roomId || HOME_SPACE) || new Set();
     };
 
-    public rebuild = throttle(() => { // exported for tests
+    private rebuild = throttle(() => {
         // get all most-upgraded rooms & spaces except spaces which have been left (historical)
         const visibleRooms = this.matrixClient.getVisibleRooms().filter(r => {
             return !r.isSpaceRoom() || r.getMyMembership() === "join";
@@ -204,7 +204,7 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
         const unseenChildren = new Set<Room>(visibleRooms);
         const backrefs = new EnhancedMap<string, Set<string>>();
 
-        // Sort spaces by room ID to force the loop breaking to be deterministic
+        // Sort spaces by room ID to force the cycle breaking to be deterministic
         const spaces = sortBy(visibleRooms.filter(r => r.isSpaceRoom()), space => space.roomId);
 
         // TODO handle cleaning up links when a Space is removed
@@ -219,7 +219,7 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
 
         const [rootSpaces, orphanedRooms] = partitionSpacesAndRooms(Array.from(unseenChildren));
 
-        // untested algorithm to handle full-cycles
+        // somewhat algorithm to handle full-cycles
         const detachedNodes = new Set<Room>(spaces);
 
         const markTreeChildren = (rootSpace: Room, unseen: Set<Room>) => {

From f7a3805eed1b987d644f81cbdcd3d3c14fc32709 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 24 Mar 2021 14:02:25 +0000
Subject: [PATCH 391/420] Fix styling inconsistency in space room view

---
 res/css/structures/_SpaceRoomView.scss      | 2 +-
 src/components/structures/SpaceRoomView.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/css/structures/_SpaceRoomView.scss b/res/css/structures/_SpaceRoomView.scss
index 080773b49b..3d3b5d1bb8 100644
--- a/res/css/structures/_SpaceRoomView.scss
+++ b/res/css/structures/_SpaceRoomView.scss
@@ -22,7 +22,7 @@ $SpaceRoomViewInnerWidth: 428px;
     width: 432px;
     box-sizing: border-box;
     border-radius: 8px;
-    border: 1px solid $input-darker-bg-color;
+    border: 1px solid $space-button-outline-color;
     font-size: $font-15px;
     margin: 20px 0;
 
diff --git a/src/components/structures/SpaceRoomView.tsx b/src/components/structures/SpaceRoomView.tsx
index 46ff37dc14..0c2f1638d1 100644
--- a/src/components/structures/SpaceRoomView.tsx
+++ b/src/components/structures/SpaceRoomView.tsx
@@ -426,7 +426,7 @@ const SpaceSetupFirstRooms = ({ space, title, description, onFinished }) => {
 const SpaceSetupPublicShare = ({ space, onFinished }) => {
     return <div className="mx_SpaceRoomView_publicShare">
         <h1>{ _t("Share %(name)s", { name: space.name }) }</h1>
-        <div className="mx_SpacePublicShare_description">
+        <div className="mx_SpaceRoomView_description">
             { _t("It's just you at the moment, it will be even better with others.") }
         </div>
 

From 6e0ab8616866e0d37a9998837e847e131cab3cd3 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 24 Mar 2021 14:10:26 +0000
Subject: [PATCH 392/420] Small usability tweaks to the add existing to space
 dialog

---
 .../dialogs/_AddExistingToSpaceDialog.scss    | 25 ++++++++---
 .../dialogs/AddExistingToSpaceDialog.tsx      | 44 +++++++++----------
 2 files changed, 40 insertions(+), 29 deletions(-)

diff --git a/res/css/views/dialogs/_AddExistingToSpaceDialog.scss b/res/css/views/dialogs/_AddExistingToSpaceDialog.scss
index 0c9d8e3840..a7cfd7bde6 100644
--- a/res/css/views/dialogs/_AddExistingToSpaceDialog.scss
+++ b/res/css/views/dialogs/_AddExistingToSpaceDialog.scss
@@ -28,22 +28,23 @@ limitations under the License.
     flex-direction: column;
     flex-wrap: nowrap;
     min-height: 0;
+    height: 80vh;
 
     .mx_Dialog_title {
         display: flex;
 
-        .mx_BaseAvatar {
-            display: inline-flex;
-            margin: 5px 16px 5px 5px;
-            vertical-align: middle;
-        }
-
         .mx_BaseAvatar_image {
             border-radius: 8px;
             margin: 0;
             vertical-align: unset;
         }
 
+        .mx_BaseAvatar {
+            display: inline-flex;
+            margin: 5px 16px 5px 5px;
+            vertical-align: middle;
+        }
+
         > div {
             > h1 {
                 font-weight: $font-semi-bold;
@@ -101,6 +102,7 @@ limitations under the License.
 
     .mx_SearchBox {
         margin: 0;
+        flex-grow: 0;
     }
 
     .mx_AddExistingToSpaceDialog_errorText {
@@ -112,7 +114,10 @@ limitations under the License.
     }
 
     .mx_AddExistingToSpaceDialog_content {
+        flex-grow: 1;
+
         .mx_AddExistingToSpaceDialog_noResults {
+            display: block;
             margin-top: 24px;
         }
     }
@@ -162,8 +167,14 @@ limitations under the License.
 
         > span {
             flex-grow: 1;
-            font-size: $font-12px;
+            font-size: $font-14px;
             line-height: $font-15px;
+            font-weight: $font-semi-bold;
+
+            .mx_AccessibleButton {
+                font-size: inherit;
+                display: inline-block;
+            }
 
             > * {
                 vertical-align: middle;
diff --git a/src/components/views/dialogs/AddExistingToSpaceDialog.tsx b/src/components/views/dialogs/AddExistingToSpaceDialog.tsx
index fec1a178ca..04bec39238 100644
--- a/src/components/views/dialogs/AddExistingToSpaceDialog.tsx
+++ b/src/components/views/dialogs/AddExistingToSpaceDialog.tsx
@@ -109,7 +109,7 @@ const AddExistingToSpaceDialog: React.FC<IProps> = ({ matrixClient: cli, space,
     const title = <React.Fragment>
         <RoomAvatar room={selectedSpace} height={40} width={40} />
         <div>
-            <h1>{ _t("Add existing spaces/rooms") }</h1>
+            <h1>{ _t("Add existing rooms") }</h1>
             { spaceOptionSection }
         </div>
     </React.Fragment>;
@@ -130,27 +130,6 @@ const AddExistingToSpaceDialog: React.FC<IProps> = ({ matrixClient: cli, space,
             autoComplete={true}
         />
         <AutoHideScrollbar className="mx_AddExistingToSpaceDialog_content" id="mx_AddExistingToSpaceDialog">
-            { spaces.length > 0 ? (
-                <div className="mx_AddExistingToSpaceDialog_section mx_AddExistingToSpaceDialog_section_spaces">
-                    <h3>{ _t("Spaces") }</h3>
-                    { spaces.map(space => {
-                        return <Entry
-                            key={space.roomId}
-                            room={space}
-                            checked={selectedToAdd.has(space)}
-                            onChange={(checked) => {
-                                if (checked) {
-                                    selectedToAdd.add(space);
-                                } else {
-                                    selectedToAdd.delete(space);
-                                }
-                                setSelectedToAdd(new Set(selectedToAdd));
-                            }}
-                        />;
-                    }) }
-                </div>
-            ) : null }
-
             { rooms.length > 0 ? (
                 <div className="mx_AddExistingToSpaceDialog_section">
                     <h3>{ _t("Rooms") }</h3>
@@ -172,6 +151,27 @@ const AddExistingToSpaceDialog: React.FC<IProps> = ({ matrixClient: cli, space,
                 </div>
             ) : undefined }
 
+            { spaces.length > 0 ? (
+                <div className="mx_AddExistingToSpaceDialog_section mx_AddExistingToSpaceDialog_section_spaces">
+                    <h3>{ _t("Spaces") }</h3>
+                    { spaces.map(space => {
+                        return <Entry
+                            key={space.roomId}
+                            room={space}
+                            checked={selectedToAdd.has(space)}
+                            onChange={(checked) => {
+                                if (checked) {
+                                    selectedToAdd.add(space);
+                                } else {
+                                    selectedToAdd.delete(space);
+                                }
+                                setSelectedToAdd(new Set(selectedToAdd));
+                            }}
+                        />;
+                    }) }
+                </div>
+            ) : null }
+
             { spaces.length + rooms.length < 1 ? <span className="mx_AddExistingToSpaceDialog_noResults">
                 { _t("No results") }
             </span> : undefined }

From a2a1e37fa3cb3011508e93043ce507b6a0b64249 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 24 Mar 2021 14:18:06 +0000
Subject: [PATCH 393/420] Add prompt to bottom of room list to invite to space

---
 res/css/views/rooms/_RoomList.scss        | 24 +++++++---
 res/img/element-icons/roomlist/browse.svg |  4 ++
 src/components/views/rooms/RoomList.tsx   | 55 +++++++++++++++++++++--
 3 files changed, 73 insertions(+), 10 deletions(-)
 create mode 100644 res/img/element-icons/roomlist/browse.svg

diff --git a/res/css/views/rooms/_RoomList.scss b/res/css/views/rooms/_RoomList.scss
index d49ed4b736..641b434af4 100644
--- a/res/css/views/rooms/_RoomList.scss
+++ b/res/css/views/rooms/_RoomList.scss
@@ -35,28 +35,32 @@ limitations under the License.
     margin: 4px 12px 4px;
     padding-top: 12px;
     border-top: 1px solid $tertiary-fg-color;
-    font-size: $font-13px;
+    font-size: $font-14px;
 
     div:first-child {
         font-weight: $font-semi-bold;
+        line-height: $font-18px;
+        color: $primary-fg-color;
     }
 
     .mx_AccessibleButton {
-        color: $secondary-fg-color;
+        color: $primary-fg-color;
         position: relative;
-        padding: 0 0 0 24px;
+        padding: 8px 8px 8px 32px;
         font-size: inherit;
-        margin-top: 8px;
+        margin-top: 12px;
         display: block;
         text-align: start;
+        background-color: $roomlist-button-bg-color;
+        border-radius: 4px;
 
         &::before {
             content: '';
             width: 16px;
             height: 16px;
             position: absolute;
-            top: 0;
-            left: 0;
+            top: 8px;
+            left: 8px;
             background: $secondary-fg-color;
             mask-position: center;
             mask-size: contain;
@@ -70,5 +74,13 @@ limitations under the License.
         &.mx_RoomList_explorePrompt_explore::before {
             mask-image: url('$(res)/img/element-icons/roomlist/explore.svg');
         }
+
+        &.mx_RoomList_explorePrompt_spaceInvite::before {
+            mask-image: url('$(res)/img/element-icons/room/invite.svg');
+        }
+
+        &.mx_RoomList_explorePrompt_spaceExplore::before {
+            mask-image: url('$(res)/img/element-icons/roomlist/browse.svg');
+        }
     }
 }
diff --git a/res/img/element-icons/roomlist/browse.svg b/res/img/element-icons/roomlist/browse.svg
new file mode 100644
index 0000000000..04714e2881
--- /dev/null
+++ b/res/img/element-icons/roomlist/browse.svg
@@ -0,0 +1,4 @@
+<svg width="18" height="17" viewBox="0 0 18 17" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.00262 5.60945C7.02444 6.31867 7.18204 6.99371 7.45029 7.60945H5.83106L5.49798 11.0235H8.60274L8.757 9.44233C9.29964 9.94168 9.94406 10.3321 10.6556 10.579L10.6122 11.0235H12.7966C13.3489 11.0235 13.7966 11.4712 13.7966 12.0235C13.7966 12.5758 13.3489 13.0235 12.7966 13.0235H10.4171L10.1823 15.4305C10.1287 15.9802 9.63959 16.3823 9.08991 16.3287C8.54024 16.2751 8.13811 15.786 8.19174 15.2363L8.40762 13.0235H5.30286L5.06803 15.4305C5.0144 15.9802 4.52533 16.3823 3.97565 16.3287C3.42598 16.2751 3.02385 15.786 3.07748 15.2363L3.29336 13.0235H1.6665C1.11422 13.0235 0.666504 12.5758 0.666504 12.0235C0.666504 11.4712 1.11422 11.0235 1.6665 11.0235H3.48848L3.82156 7.60945H2.26807C1.71578 7.60945 1.26807 7.16173 1.26807 6.60945C1.26807 6.05716 1.71578 5.60945 2.26807 5.60945H4.01668L4.28073 2.90297C4.33436 2.3533 4.82343 1.95117 5.37311 2.0048C5.92278 2.05842 6.32491 2.5475 6.27128 3.09717L6.02618 5.60945H7.00262Z" fill="#8D99A5"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14.4224 5.37843C14.4224 6.50754 13.5071 7.42287 12.3779 7.42287C11.2488 7.42287 10.3335 6.50754 10.3335 5.37843C10.3335 4.24931 11.2488 3.33398 12.3779 3.33398C13.5071 3.33398 14.4224 4.24931 14.4224 5.37843ZM15.8496 7.45454C16.2133 6.84764 16.4224 6.13745 16.4224 5.37843C16.4224 3.14474 14.6116 1.33398 12.3779 1.33398C10.1443 1.33398 8.3335 3.14474 8.3335 5.37843C8.3335 7.61211 10.1443 9.42287 12.3779 9.42287C13.1369 9.42287 13.8471 9.21381 14.454 8.85013C14.4853 8.89368 14.5205 8.93528 14.5597 8.97444L16.293 10.7078C16.6835 11.0983 17.3167 11.0983 17.7072 10.7078C18.0977 10.3172 18.0977 9.68408 17.7072 9.29356L15.9739 7.56023C15.9347 7.52107 15.8931 7.48584 15.8496 7.45454Z" fill="#8D99A5"/>
+</svg>
diff --git a/src/components/views/rooms/RoomList.tsx b/src/components/views/rooms/RoomList.tsx
index 4378154d8f..01affc8b2f 100644
--- a/src/components/views/rooms/RoomList.tsx
+++ b/src/components/views/rooms/RoomList.tsx
@@ -20,6 +20,7 @@ import React, { ReactComponentElement } from "react";
 import { Dispatcher } from "flux";
 import { Room } from "matrix-js-sdk/src/models/room";
 import * as fbEmitter from "fbemitter";
+import { EventType } from "matrix-js-sdk/src/@types/event";
 
 import { _t, _td } from "../../../languageHandler";
 import { RovingTabIndexProvider } from "../../../accessibility/RovingTabIndex";
@@ -48,12 +49,15 @@ import { IconizedContextMenuOption, IconizedContextMenuOptionList } from "../con
 import AccessibleButton from "../elements/AccessibleButton";
 import { CommunityPrototypeStore } from "../../../stores/CommunityPrototypeStore";
 import CallHandler from "../../../CallHandler";
-import SpaceStore, { SUGGESTED_ROOMS } from "../../../stores/SpaceStore";
+import SpaceStore, {SUGGESTED_ROOMS, UPDATE_SELECTED_SPACE} from "../../../stores/SpaceStore";
 import { showAddExistingRooms, showCreateNewRoom } from "../../../utils/space";
-import { EventType } from "matrix-js-sdk/src/@types/event";
 import {replaceableComponent} from "../../../utils/replaceableComponent";
 import RoomAvatar from "../avatars/RoomAvatar";
 import { ISpaceSummaryRoom } from "../../structures/SpaceRoomDirectory";
+import { showRoomInviteDialog } from "../../../RoomInvite";
+import Modal from "../../../Modal";
+import SpacePublicShare from "../spaces/SpacePublicShare";
+import InfoDialog from "../dialogs/InfoDialog";
 
 interface IProps {
     onKeyDown: (ev: React.KeyboardEvent) => void;
@@ -68,6 +72,7 @@ interface IState {
     sublists: ITagMap;
     isNameFiltering: boolean;
     currentRoomId?: string;
+    activeSpace: Room;
     suggestedRooms: ISpaceSummaryRoom[];
 }
 
@@ -194,7 +199,7 @@ const TAG_AESTHETICS: ITagAestheticsMap = {
                             : _t("You do not have permissions to add rooms to this space")}
                     />
                     <IconizedContextMenuOption
-                        label={_t("Explore space rooms")}
+                        label={_t("Explore rooms")}
                         iconClassName="mx_RoomList_iconExplore"
                         onClick={(e) => {
                             e.preventDefault();
@@ -282,6 +287,7 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
         this.state = {
             sublists: {},
             isNameFiltering: !!RoomListStore.instance.getFirstNameFilterCondition(),
+            activeSpace: SpaceStore.instance.activeSpace,
             suggestedRooms: SpaceStore.instance.suggestedRooms,
         };
 
@@ -294,6 +300,7 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
     }
 
     public componentDidMount(): void {
+        SpaceStore.instance.on(UPDATE_SELECTED_SPACE, this.updateActiveSpace);
         SpaceStore.instance.on(SUGGESTED_ROOMS, this.updateSuggestedRooms);
         RoomListStore.instance.on(LISTS_UPDATE_EVENT, this.updateLists);
         this.customTagStoreRef = CustomRoomTagStore.addListener(this.updateLists);
@@ -301,6 +308,7 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
     }
 
     public componentWillUnmount() {
+        SpaceStore.instance.off(UPDATE_SELECTED_SPACE, this.updateActiveSpace);
         SpaceStore.instance.off(SUGGESTED_ROOMS, this.updateSuggestedRooms);
         RoomListStore.instance.off(LISTS_UPDATE_EVENT, this.updateLists);
         defaultDispatcher.unregister(this.dispatcherRef);
@@ -366,6 +374,10 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
         return room;
     };
 
+    private updateActiveSpace = (activeSpace: Room) => {
+        this.setState({ activeSpace });
+    };
+
     private updateSuggestedRooms = (suggestedRooms: ISpaceSummaryRoom[]) => {
         this.setState({ suggestedRooms });
     };
@@ -424,6 +436,25 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
         dis.dispatch({ action: Action.ViewRoomDirectory, initialText });
     };
 
+    private onSpaceInviteClick = () => {
+        const initialText = RoomListStore.instance.getFirstNameFilterCondition()?.search;
+        if (this.state.activeSpace.getJoinRule() === "public") {
+            const modal = Modal.createTrackedDialog("Space Invite", "User Menu", InfoDialog, {
+                title: _t("Invite to %(spaceName)s", { spaceName: this.state.activeSpace.name }),
+                description: <React.Fragment>
+                    <span>{ _t("Share your public space") }</span>
+                    <SpacePublicShare space={this.state.activeSpace} onFinished={() => modal.close()} />
+                </React.Fragment>,
+                fixedWidth: false,
+                button: false,
+                className: "mx_SpacePanel_sharePublicSpace",
+                hasCloseButton: true,
+            });
+        } else {
+            showRoomInviteDialog(this.state.activeSpace.roomId, initialText);
+        }
+    };
+
     private renderSuggestedRooms(): ReactComponentElement<typeof ExtraTile>[] {
         return this.state.suggestedRooms.map(room => {
             const name = room.name || room.canonical_alias || room.aliases.pop() || _t("Empty room");
@@ -569,7 +600,23 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
                         kind="link"
                         onClick={this.onExplore}
                     >
-                        {_t("Explore all public rooms")}
+                        { this.state.activeSpace ? _t("Explore rooms") : _t("Explore all public rooms") }
+                    </AccessibleButton>
+                </div>;
+            } else if (this.state.activeSpace) {
+                explorePrompt = <div className="mx_RoomList_explorePrompt">
+                    <div>{ _t("Quick actions") }</div>
+                    { this.state.activeSpace.canInvite(MatrixClientPeg.get().getUserId()) && <AccessibleButton
+                        className="mx_RoomList_explorePrompt_spaceInvite"
+                        onClick={this.onSpaceInviteClick}
+                    >
+                        {_t("Invite people")}
+                    </AccessibleButton> }
+                    <AccessibleButton
+                        className="mx_RoomList_explorePrompt_spaceExplore"
+                        onClick={this.onExplore}
+                    >
+                        {_t("Explore rooms")}
                     </AccessibleButton>
                 </div>;
             } else if (Object.values(this.state.sublists).some(list => list.length > 0)) {

From 3df3baea14f931251b1a76cc995a52f0fb2ea7bf Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 24 Mar 2021 14:19:10 +0000
Subject: [PATCH 394/420] Tweak behaviour during space creation

---
 src/components/structures/SpaceRoomView.tsx      | 2 +-
 src/components/views/spaces/SpacePublicShare.tsx | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/structures/SpaceRoomView.tsx b/src/components/structures/SpaceRoomView.tsx
index 0c2f1638d1..16028f0975 100644
--- a/src/components/structures/SpaceRoomView.tsx
+++ b/src/components/structures/SpaceRoomView.tsx
@@ -430,7 +430,7 @@ const SpaceSetupPublicShare = ({ space, onFinished }) => {
             { _t("It's just you at the moment, it will be even better with others.") }
         </div>
 
-        <SpacePublicShare space={space} onFinished={onFinished} />
+        <SpacePublicShare space={space} />
 
         <div className="mx_SpaceRoomView_buttons">
             <AccessibleButton kind="primary" onClick={onFinished}>
diff --git a/src/components/views/spaces/SpacePublicShare.tsx b/src/components/views/spaces/SpacePublicShare.tsx
index b2d3b7ce29..fa81b75525 100644
--- a/src/components/views/spaces/SpacePublicShare.tsx
+++ b/src/components/views/spaces/SpacePublicShare.tsx
@@ -26,7 +26,7 @@ import {showRoomInviteDialog} from "../../../RoomInvite";
 
 interface IProps {
     space: Room;
-    onFinished(): void;
+    onFinished?(): void;
 }
 
 const SpacePublicShare = ({ space, onFinished }: IProps) => {
@@ -54,7 +54,7 @@ const SpacePublicShare = ({ space, onFinished }: IProps) => {
             className="mx_SpacePublicShare_inviteButton"
             onClick={() => {
                 showRoomInviteDialog(space.roomId);
-                onFinished();
+                if (onFinished) onFinished();
             }}
         >
             <h3>{ _t("Invite people") }</h3>

From ea760e8f296cfbcf0b8acc172c7a3b16e8a54adf Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 24 Mar 2021 15:26:56 +0000
Subject: [PATCH 395/420] Fix space room directory behaviour

---
 src/components/structures/SpaceRoomDirectory.tsx | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/components/structures/SpaceRoomDirectory.tsx b/src/components/structures/SpaceRoomDirectory.tsx
index 2fb0101f88..877a4283f1 100644
--- a/src/components/structures/SpaceRoomDirectory.tsx
+++ b/src/components/structures/SpaceRoomDirectory.tsx
@@ -77,7 +77,6 @@ export interface ISpaceSummaryEvent {
 
 interface ITileProps {
     room: ISpaceSummaryRoom;
-    editing?: boolean;
     suggested?: boolean;
     selected?: boolean;
     numChildRooms?: number;
@@ -88,7 +87,6 @@ interface ITileProps {
 
 const Tile: React.FC<ITileProps> = ({
     room,
-    editing,
     suggested,
     selected,
     hasPermissions,
@@ -170,12 +168,6 @@ const Tile: React.FC<ITileProps> = ({
         </div>
     </React.Fragment>;
 
-    if (editing) {
-        return <div className="mx_SpaceRoomDirectory_roomTile">
-            { content }
-        </div>
-    }
-
     let childToggle;
     let childSection;
     if (children) {
@@ -201,7 +193,7 @@ const Tile: React.FC<ITileProps> = ({
             className={classNames("mx_SpaceRoomDirectory_roomTile", {
                 mx_SpaceRoomDirectory_subspace: room.room_type === RoomType.Space,
             })}
-            onClick={hasPermissions ? onToggleClick : onPreviewClick}
+            onClick={(hasPermissions && onToggleClick) ? onToggleClick : onPreviewClick}
         >
             { content }
             { childToggle }

From 65a7d0621d5b14b340a9647049cc85b350ba7381 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 24 Mar 2021 15:30:03 +0000
Subject: [PATCH 396/420] Add invite to space button to room intro

---
 res/css/views/rooms/_NewRoomIntro.scss      |  7 +++-
 src/components/views/rooms/NewRoomIntro.tsx | 46 +++++++++++++++++----
 2 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/res/css/views/rooms/_NewRoomIntro.scss b/res/css/views/rooms/_NewRoomIntro.scss
index 4322ba341c..9c2a428cb3 100644
--- a/res/css/views/rooms/_NewRoomIntro.scss
+++ b/res/css/views/rooms/_NewRoomIntro.scss
@@ -33,8 +33,13 @@ limitations under the License.
 
         .mx_AccessibleButton {
             line-height: $font-24px;
+            display: inline-block;
 
-            &::before {
+            & + .mx_AccessibleButton {
+                margin-left: 12px;
+            }
+
+            &:not(.mx_AccessibleButton_kind_primary_outline)::before {
                 content: '';
                 display: inline-block;
                 background-color: $button-fg-color;
diff --git a/src/components/views/rooms/NewRoomIntro.tsx b/src/components/views/rooms/NewRoomIntro.tsx
index ce426a64ed..c85b9d7868 100644
--- a/src/components/views/rooms/NewRoomIntro.tsx
+++ b/src/components/views/rooms/NewRoomIntro.tsx
@@ -28,6 +28,7 @@ import defaultDispatcher from "../../../dispatcher/dispatcher";
 import {ViewUserPayload} from "../../../dispatcher/payloads/ViewUserPayload";
 import {Action} from "../../../dispatcher/actions";
 import dis from "../../../dispatcher/dispatcher";
+import SpaceStore from "../../../stores/SpaceStore";
 
 const NewRoomIntro = () => {
     const cli = useContext(MatrixClientContext);
@@ -100,17 +101,48 @@ const NewRoomIntro = () => {
             });
         }
 
-        let buttons;
-        if (room.canInvite(cli.getUserId())) {
-            const onInviteClick = () => {
-                dis.dispatch({ action: "view_invite", roomId });
-            };
+        let parentSpace;
+        if (
+            SpaceStore.instance.activeSpace?.canInvite(cli.getUserId()) &&
+            SpaceStore.instance.getSpaceFilteredRoomIds(SpaceStore.instance.activeSpace).has(room.roomId)
+        ) {
+            parentSpace = SpaceStore.instance.activeSpace;
+        }
 
+        let buttons;
+        if (parentSpace) {
             buttons = <div className="mx_NewRoomIntro_buttons">
-                <AccessibleButton className="mx_NewRoomIntro_inviteButton" kind="primary" onClick={onInviteClick}>
+                <AccessibleButton
+                    className="mx_NewRoomIntro_inviteButton"
+                    kind="primary"
+                    onClick={() => {
+                        dis.dispatch({ action: "view_invite", roomId });
+                    }}
+                >
+                    {_t("Invite to %(spaceName)s", { spaceName: parentSpace.name })}
+                </AccessibleButton>
+                { room.canInvite(cli.getUserId()) && <AccessibleButton
+                    className="mx_NewRoomIntro_inviteButton"
+                    kind="primary_outline"
+                    onClick={() => {
+                        dis.dispatch({ action: "view_invite", roomId });
+                    }}
+                >
+                    {_t("Invite to just this room")}
+                </AccessibleButton> }
+            </div>;
+        } else if (room.canInvite(cli.getUserId())) {
+            buttons = <div className="mx_NewRoomIntro_buttons">
+                <AccessibleButton
+                    className="mx_NewRoomIntro_inviteButton"
+                    kind="primary"
+                    onClick={() => {
+                        dis.dispatch({ action: "view_invite", roomId });
+                    }}
+                >
                     {_t("Invite to this room")}
                 </AccessibleButton>
-            </div>
+            </div>;
         }
 
         const avatarUrl = room.currentState.getStateEvents(EventType.RoomAvatar, "")?.getContent()?.url;

From 11fbd081f146bce1ce53c07a064300afacf8036f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 24 Mar 2021 15:30:36 +0000
Subject: [PATCH 397/420] Iterate space panel context menu

---
 .../views/spaces/SpaceTreeLevel.tsx           | 32 +++++++++++++++----
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/components/views/spaces/SpaceTreeLevel.tsx b/src/components/views/spaces/SpaceTreeLevel.tsx
index 83bc2296e7..1b86bb7898 100644
--- a/src/components/views/spaces/SpaceTreeLevel.tsx
+++ b/src/components/views/spaces/SpaceTreeLevel.tsx
@@ -30,7 +30,12 @@ import IconizedContextMenu, {
 import {_t} from "../../../languageHandler";
 import {ContextMenuTooltipButton} from "../../../accessibility/context_menu/ContextMenuTooltipButton";
 import {toRightOf} from "../../structures/ContextMenu";
-import {shouldShowSpaceSettings, showCreateNewRoom, showSpaceSettings} from "../../../utils/space";
+import {
+    shouldShowSpaceSettings,
+    showAddExistingRooms,
+    showCreateNewRoom,
+    showSpaceSettings,
+} from "../../../utils/space";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import {ButtonEvent} from "../elements/AccessibleButton";
 import defaultDispatcher from "../../../dispatcher/dispatcher";
@@ -127,7 +132,7 @@ export class SpaceItem extends React.PureComponent<IItemProps, IItemState> {
 
         if (this.props.space.getJoinRule() === "public") {
             const modal = Modal.createTrackedDialog("Space Invite", "User Menu", InfoDialog, {
-                title: _t("Invite members"),
+                title: _t("Invite to %(spaceName)s", { spaceName: this.props.space.name }),
                 description: <React.Fragment>
                     <span>{ _t("Share your public space") }</span>
                     <SpacePublicShare space={this.props.space} onFinished={() => modal.close()} />
@@ -170,6 +175,14 @@ export class SpaceItem extends React.PureComponent<IItemProps, IItemState> {
         this.setState({contextMenuPosition: null}); // also close the menu
     };
 
+    private onAddExistingRoomClick = (ev: ButtonEvent) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+
+        showAddExistingRooms(this.context, this.props.space);
+        this.setState({contextMenuPosition: null}); // also close the menu
+    };
+
     private onMembersClick = (ev: ButtonEvent) => {
         ev.preventDefault();
         ev.stopPropagation();
@@ -236,15 +249,20 @@ export class SpaceItem extends React.PureComponent<IItemProps, IItemState> {
                 </IconizedContextMenuOptionList>;
             }
 
-            let newRoomOption;
+            let newRoomSection;
             if (this.props.space.currentState.maySendStateEvent(EventType.SpaceChild, userId)) {
-                newRoomOption = (
+                newRoomSection = <IconizedContextMenuOptionList first>
                     <IconizedContextMenuOption
                         iconClassName="mx_SpacePanel_iconPlus"
-                        label={_t("New room")}
+                        label={_t("Create new room")}
                         onClick={this.onNewRoomClick}
                     />
-                );
+                    <IconizedContextMenuOption
+                        iconClassName="mx_SpacePanel_iconPlus"
+                        label={_t("Add existing room")}
+                        onClick={this.onAddExistingRoomClick}
+                    />
+                </IconizedContextMenuOptionList>;
             }
 
             contextMenu = <IconizedContextMenu
@@ -274,8 +292,8 @@ export class SpaceItem extends React.PureComponent<IItemProps, IItemState> {
                         label={_t("Explore rooms")}
                         onClick={this.onExploreRoomsClick}
                     />
-                    { newRoomOption }
                 </IconizedContextMenuOptionList>
+                { newRoomSection }
                 { leaveSection }
             </IconizedContextMenu>;
         }

From 31dd224cc98c4fc7d44ac1296abe338593ca0751 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 24 Mar 2021 15:36:20 +0000
Subject: [PATCH 398/420] Wire up passing through initialText for room invite
 dialog helper method

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

diff --git a/src/RoomInvite.js b/src/RoomInvite.js
index 9ae41b851a..aa758ecbdc 100644
--- a/src/RoomInvite.js
+++ b/src/RoomInvite.js
@@ -49,11 +49,12 @@ export function showStartChatInviteDialog(initialText) {
     );
 }
 
-export function showRoomInviteDialog(roomId) {
+export function showRoomInviteDialog(roomId, initialText = "") {
     // This dialog handles the room creation internally - we don't need to worry about it.
     Modal.createTrackedDialog(
         "Invite Users", "", InviteDialog, {
             kind: KIND_INVITE,
+            initialText,
             roomId,
         },
         /*className=*/null, /*isPriority=*/false, /*isStatic=*/true,

From d7484607165c32103f5f344d1fea05116c874a2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bal=C3=A1zs=20Mesk=C3=B3?= <meskobalazs@gmail.com>
Date: Tue, 23 Mar 2021 17:02:21 +0000
Subject: [PATCH 399/420] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2889 of 2889 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
---
 src/i18n/strings/hu.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index e5901ef9a3..ccc871d097 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1953,7 +1953,7 @@
     "Accepting…": "Elfogadás…",
     "Accepting …": "Elfogadás …",
     "Declining …": "Elutasítás …",
-    "Verification Requests": "Hitelesítés Kérések",
+    "Verification Requests": "Hitelesítéskérések",
     "Your account is not secure": "A fiókod nem biztonságos",
     "Your password": "A jelszavad",
     "This session, or the other session": "Ez vagy másik munkamenet",
@@ -3079,9 +3079,9 @@
     "Setting:": "Beállítás:",
     "Value in this room": "Érték ebben a szobában",
     "Value": "Érték",
-    "Setting ID": "Beállítás azon.",
-    "Failed to save settings": "A beállítások elmentése nem sikerült",
-    "Settings Explorer": "Beállítás Böngésző",
+    "Setting ID": "Beállításazonosító",
+    "Failed to save settings": "A beállítások mentése sikertelen",
+    "Settings Explorer": "Beállításböngésző",
     "Show chat effects (animations when receiving e.g. confetti)": "Csevegés effektek megjelenítése (mint a konfetti animáció)",
     "Original event source": "Eredeti esemény forráskód",
     "Decrypted event source": "Visszafejtett esemény forráskód",

From efa57e5121e87c26e757eaf15cdf2b8139c791d7 Mon Sep 17 00:00:00 2001
From: Marcelo Filho <marceloaof@protonmail.com>
Date: Tue, 23 Mar 2021 19:37:38 +0000
Subject: [PATCH 400/420] Translated using Weblate (Portuguese (Brazil))

Currently translated at 99.1% (2865 of 2889 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/pt_BR/
---
 src/i18n/strings/pt_BR.json | 75 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 74 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index f054fa31e6..0ec835362a 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -3037,5 +3037,78 @@
     "Delete": "Excluir",
     "This homeserver has been blocked by it's administrator.": "Este servidor local foi bloqueado pelo seu administrador.",
     "This homeserver has been blocked by its administrator.": "Este servidor local foi bloqueado pelo seu administrador.",
-    "You're already in a call with this person.": "Você já está em uma chamada com essa pessoa."
+    "You're already in a call with this person.": "Você já está em uma chamada com essa pessoa.",
+    "At the moment only you can see it.": "No momento, só você pode ver.",
+    "Failed to create initial space rooms": "Falha ao criar salas de espaço iniciais",
+    "Your private space <name/>": "Seu espaço privado <name/>",
+    "Your public space <name/>": "Seu espaço público <name/>",
+    "You have been invited to <name/>": "Você foi convidado para <name/>",
+    "<inviter/> invited you to <name/>": "<inviter/> convidou você para <name/>",
+    "%(count)s members|one": "%(count)s integrante",
+    "%(count)s members|other": "%(count)s integrantes",
+    "Add existing rooms & spaces": "Adicionar salas & espaços já existentes",
+    "Accept Invite": "Aceitar o convite",
+    "Save changes": "Salvar alterações",
+    "You're in this room": "Você está nesta sala",
+    "You're in this space": "Você está neste espaço",
+    "No permissions": "Sem permissões",
+    "Undo": "Desfazer",
+    "Your message wasn't sent because this homeserver has been blocked by it's administrator. Please <a>contact your service administrator</a> to continue using the service.": "A sua mensagem não foi enviada porque este servidor local foi bloqueado pelo seu administrador. <a>Entre em contato com o administrador do serviço</a> para continuar usando o serviço.",
+    "Are you sure you want to leave the space '%(spaceName)s'?": "Tem certeza de que deseja sair desse espaço '%(spaceName)s'?",
+    "This space is not public. You will not be able to rejoin without an invite.": "Este espaço não é público. Você não poderá entrar novamente sem um convite.",
+    "Save Changes": "Salvar alterações",
+    "Saving...": "Salvando...",
+    "View dev tools": "Ver ferramentas de desenvolvimento",
+    "Leave space": "Sair desse espaço",
+    "Leave Space": "Sair desse espaço",
+    "Make this space private": "Tornar este espaço privado",
+    "Edit settings relating to your space.": "Editar configurações relacionadas ao seu espaço.",
+    "Space settings": "Configurações desse espaço",
+    "Failed to save space settings.": "Falha ao salvar as configurações desse espaço.",
+    "Invite someone using their name, username (like <userId/>) or <a>share this space</a>.": "Convide alguém a partir do nome, nome de usuário (como <userId/>) ou <a>compartilhe este espaço</a>.",
+    "Invite someone using their name, email address, username (like <userId/>) or <a>share this space</a>.": "Convide alguém a partir do nome, endereço de e-mail, nome de usuário (como <userId/>) ou <a>compartilhe este espaço</a>.",
+    "Unnamed Space": "Espaço sem nome",
+    "Invite to %(spaceName)s": "Convidar para %(spaceName)s",
+    "Failed to add rooms to space": "Falha ao adicionar salas ao espaço",
+    "Create a new room": "Criar uma nova sala",
+    "Don't want to add an existing room?": "Não deseja adicionar uma sala já existente?",
+    "Spaces": "Espaços",
+    "Filter your rooms and spaces": "Pesquisar suas salas e espaços",
+    "Add existing spaces/rooms": "Adicionar espaços/salas já existentes",
+    "Explore space rooms": "Explorar as salas deste espaço",
+    "You do not have permissions to add rooms to this space": "Você não tem permissão para adicionar salas neste espaço",
+    "You do not have permissions to create new rooms in this space": "Você não tem permissão para criar novas salas neste espaço",
+    "Invite to this space": "Convidar para este espaço",
+    "Your message was sent": "A sua mensagem foi enviada",
+    "Encrypting your message...": "Criptografando a sua mensagem...",
+    "Sending your message...": "Enviando a sua mensagem...",
+    "Spell check dictionaries": "Dicionários de verificação ortográfica",
+    "Space options": "Opções do espaço",
+    "New room": "Nova sala",
+    "Invite people": "Convidar pessoas",
+    "Share your public space": "Compartilhar o seu espaço público",
+    "Invite members": "Convidar integrantes",
+    "Invite by email or username": "Convidar por e-mail ou nome de usuário",
+    "Share invite link": "Compartilhar link de convite",
+    "Click to copy": "Clique para copiar",
+    "Collapse space panel": "Fechar o painel do espaço",
+    "Expand space panel": "Expandir o painel do espaço",
+    "You can change these at any point.": "Você pode alterar esses dados a qualquer momento.",
+    "Give it a photo, name and description to help you identify it.": "Insira uma foto, nome e descrição para ajudar a identificar o espaço.",
+    "Your private space": "O seu espaço privado",
+    "Your public space": "O seu espaço público",
+    "You can change this later": "Você pode mudar isso depois",
+    "Open space for anyone, best for communities": "Abra espaços para todos, especialmente para comunidades",
+    "Spaces are new ways to group rooms and people. To join an existing space you’ll need an invite": "Espaços são novas formas de agrupar salas e pessoas. Para entrar em um espaço existente, você precisará de um convite",
+    "Create a space": "Criar um espaço",
+    "Jump to the bottom of the timeline when you send a message": "Vá para o final da linha do tempo ao enviar uma mensagem",
+    "Spaces prototype. Incompatible with Communities, Communities v2 and Custom Tags. Requires compatible homeserver for some features.": "Protótipo de Espaços. Incompatível com Comunidades, Comunidades v2 e tags personalizadas. Requer um servidor compatível com os recursos necessários.",
+    "Decrypted event source": "Fonte de evento descriptografada",
+    "We'll create rooms for each of them. You can add existing rooms after setup.": "Criaremos salas para cada um deles. Você pode adicionar salas já existentes após a configuração.",
+    "What projects are you working on?": "Em quais projetos você trabalha no momento?",
+    "We'll create rooms for each topic.": "Nós criaremos salas para cada tópico.",
+    "Inviting...": "Convidando...",
+    "Invite by username": "Convidar por nome de usuário",
+    "Support": "Suporte",
+    "Original event source": "Fonte do evento original"
 }

From 3a401a31518473f8585edcecb26498d2442a0d7f Mon Sep 17 00:00:00 2001
From: Nikita Epifanov <NikGreens@protonmail.com>
Date: Wed, 24 Mar 2021 05:23:15 +0000
Subject: [PATCH 401/420] Translated using Weblate (Russian)

Currently translated at 95.6% (2763 of 2889 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ru/
---
 src/i18n/strings/ru.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index e7c8c2b4d7..4cf444ac0e 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -2064,7 +2064,7 @@
     "You changed your avatar": "Вы поменяли свой аватар",
     "%(targetName)s changed their avatar": "%(targetName)s поменял(а) свой аватар",
     "You changed the room name": "Вы поменяли имя комнаты",
-    "Enable experimental, compact IRC style layout": "Включите экспериментальный, компактный стиль IRC",
+    "Enable experimental, compact IRC style layout": "Включить экспериментальный, компактный стиль IRC",
     "Unknown caller": "Неизвестный абонент",
     "Incoming call": "Входящий звонок",
     "Waiting for your other session to verify…": "Ожидание вашей другой сессии для начала подтверждения…",

From 3ec45eda6a783000a5e927412e8c90a5c7fdebfd Mon Sep 17 00:00:00 2001
From: RainSlide <RainSlide@outlook.com>
Date: Wed, 24 Mar 2021 14:08:40 +0000
Subject: [PATCH 402/420] Translated using Weblate (Chinese (Simplified))

Currently translated at 86.4% (2497 of 2889 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hans/
---
 src/i18n/strings/zh_Hans.json | 243 ++++++++++++++++++++++++++++++----
 1 file changed, 214 insertions(+), 29 deletions(-)

diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index a22e600865..d07d6c83b6 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -166,7 +166,7 @@
     "New passwords don't match": "两次输入的新密码不符",
     "not specified": "未指定",
     "Notifications": "通知",
-    "(not supported by this browser)": "（未被此浏览器支持）",
+    "(not supported by this browser)": "（此浏览器不支持）",
     "<not supported>": "<不支持>",
     "No display name": "无昵称",
     "No results": "没有更多结果",
@@ -910,10 +910,10 @@
     "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s 将此聊天室对知道此聊天室链接的人公开。",
     "%(senderDisplayName)s made the room invite only.": "%(senderDisplayName)s 将此聊天室改为仅限邀请。",
     "%(senderDisplayName)s changed the join rule 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 与另一位正在打字…",
-    "%(names)s and %(lastPerson)s are typing …": "%(names)s 和 %(lastPerson)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 与另一位正在输入…",
+    "%(names)s and %(lastPerson)s are typing …": "%(names)s 和 %(lastPerson)s 正在输入…",
     "Unrecognised address": "无法识别地址",
     "User %(user_id)s may or may not exist": "用户 %(user_id)s 不一定存在",
     "Predictable substitutions like '@' instead of 'a' don't help very much": "可预见的替换如将 '@' 替换为 'a' 并不会有太大效果",
@@ -942,7 +942,7 @@
     "Short keyboard patterns are easy to guess": "键位短序列很容易被猜到",
     "Group & filter rooms by custom tags (refresh to apply changes)": "按自定义标签分组和过滤聊天室（刷新以应用更改）",
     "Render simple counters in room header": "在聊天室标题中显示简单计数",
-    "Enable Emoji suggestions while typing": "键入时启用表情符号建议",
+    "Enable Emoji suggestions while typing": "启用实时表情符号建议",
     "Show a placeholder for removed messages": "已移除的消息显示为一个占位符",
     "Show join/leave messages (invites/kicks/bans unaffected)": "显示 加入/离开 信息（邀请/踢出/禁止 不受影响）",
     "Show avatar changes": "显示头像更改",
@@ -951,7 +951,7 @@
     "Show a reminder to enable Secure Message Recovery in encrypted rooms": "在加密聊天室中显示一条允许恢复安全消息的提醒",
     "Show avatars in user and room mentions": "在用户和聊天室提及中显示头像",
     "Enable big emoji in chat": "在聊天中启用大型表情符号",
-    "Send typing notifications": "发送键入状态通知",
+    "Send typing notifications": "发送正在输入通知",
     "Enable Community Filter Panel": "启用社区筛选器面板",
     "Allow Peer-to-Peer for 1:1 calls": "允许一对一通话使用 P2P",
     "Prompt before sending invites to potentially invalid matrix IDs": "在发送邀请之前提示可能无效的 Matrix ID",
@@ -1259,14 +1259,14 @@
     "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 %(brand)s is misconfigured": "您的 %(brand)s 配置有错误",
-    "Use Single Sign On to continue": "使用单点登陆继续",
-    "Confirm adding this email address by using Single Sign On to prove your identity.": "通过使用单点登陆来证明您的身份，并确认添加此邮件地址。",
-    "Single Sign On": "单点登陆",
+    "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.": "点击下面的按钮，添加此邮箱地址。",
+    "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.": "点击下面的按钮，确认添加此电话号码。",
+    "Click the button below to confirm adding this phone number.": "点击下面的按钮以确认添加此电话号码。",
     "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "是否在触屏设备上使用 %(brand)s",
     "Whether you're using %(brand)s as an installed Progressive Web App": "您是否已经安装 %(brand)s 作为一种渐进式的 Web 应用",
     "Your user agent": "您的代理用户",
@@ -1282,14 +1282,14 @@
     "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账号",
+    "Review where you’re logged in": "查看您的登录位置",
+    "New login. Was this you?": "现在登录。请问是您本人吗？",
+    "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": "信任",
-    "%(name)s is requesting verification": "%(name)s请求验证",
+    "%(name)s is requesting verification": "%(name)s 正在请求验证",
     "Sign In or Create Account": "登录或创建账户",
     "Use your account or create a new one to continue.": "使用已有账户或创建一个新账户。",
     "Create Account": "创建账户",
@@ -1301,7 +1301,7 @@
     "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.": "再次检查您的服务器是否支持所选聊天室版本，然后重试。",
+    "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": "改变您在所有聊天室的头像",
@@ -1351,14 +1351,14 @@
     "%(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 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:": "您登陆了未经过验证的新会话：",
+    "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)登陆到未验证的新会话：",
+    "%(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": "手动验证文字",
@@ -1404,7 +1404,7 @@
     "about a day from now": "从现在开始约一天",
     "%(num)s days from now": "从现在开始%(num)s天",
     "%(name)s (%(userId)s)": "%(name)s%(userId)s",
-    "Your browser does not support the required cryptography extensions": "您的浏览器不支持必需的加密插件",
+    "Your browser does not support the required cryptography extensions": "您的浏览器不支持所需的密码学扩展",
     "The user's homeserver does not support the version of the room.": "用户的主服务器不支持该聊天室版本。",
     "Help us improve %(brand)s": "请协助我们改进%(brand)s",
     "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "发送<UsageDataLink>匿名使用情况数据</UsageDataLink>，以协助我们改进%(brand)s。这将使用<PolicyLink>cookie</PolicyLink>。",
@@ -1666,7 +1666,7 @@
     "Enable advanced debugging for the room list": "为此聊天室列表启用高级调试",
     "Show info about bridges in room settings": "在聊天室设置中显示桥接信息",
     "Use a more compact ‘Modern’ layout": "使用更紧凑的「现代」布局",
-    "Show typing notifications": "显示输入通知",
+    "Show typing notifications": "显示正在输入通知",
     "Show shortcuts to recently viewed rooms above the room list": "在聊天室列表上方显示最近浏览过的聊天室的快捷方式",
     "Show hidden events in timeline": "显示时间线中的隐藏事件",
     "Low bandwidth mode": "低带宽模式",
@@ -2416,17 +2416,17 @@
     "%(senderDisplayName)s set the server ACLs for this room.": "%(senderDisplayName)s 为此聊天室设置了服务器 ACL。",
     "Hong Kong": "香港",
     "Cook Islands": "库克群岛",
-    "Congo - Kinshasa": "刚果金",
-    "Congo - Brazzaville": "刚果布拉柴维尔",
+    "Congo - Kinshasa": "刚果 - 金沙萨",
+    "Congo - Brazzaville": "刚果 - 布拉柴维尔",
     "Comoros": "科摩罗",
     "Colombia": "哥伦比亚",
-    "Cocos (Keeling) Islands": "科科斯基林群岛",
+    "Cocos (Keeling) Islands": "科科斯（基林）群岛",
     "Christmas Island": "圣诞岛",
     "China": "中国",
     "Chile": "智利",
     "Chad": "乍得",
     "Central African Republic": "中非共和国",
-    "Cayman Islands": "开曼群岛(英)",
+    "Cayman Islands": "开曼群岛",
     "Caribbean Netherlands": "荷兰加勒比区",
     "Cape Verde": "佛得角",
     "Canada": "加拿大",
@@ -2472,7 +2472,7 @@
     "United States": "美国",
     "United Kingdom": "英国",
     "Your homeserver rejected your log in attempt. This could be due to things just taking too long. Please try again. If this continues, please contact your homeserver administrator.": "您的主服务器已拒绝您的登入尝试。请重试。如果此情况持续发生，请联系您的主服务器管理员。",
-    "Your homeserver was unreachable and was not able to log you in. Please try again. If this continues, please contact your homeserver administrator.": "您的主服务器不可达，无法使您登入。请重试。如果此情况持续发生，请联系您的主服务器管理员。",
+    "Your homeserver was unreachable and was not able to log you in. Please try again. If this continues, please contact your homeserver administrator.": "无法访问您的主服务器，因而无法登入。请重试。如果此情况持续发生，请联系您的主服务器管理员。",
     "Try again": "重试",
     "We asked the browser to remember which homeserver you use to let you sign in, but unfortunately your browser has forgotten it. Go to the sign in page and try again.": "我们已要求浏览器记住您使用的主服务器，但不幸的是您的浏览器已忘记。请前往登录页面重试。",
     "We couldn't log you in": "我们无法使您登入",
@@ -2555,5 +2555,190 @@
     "Prepends ┬──┬ ノ( ゜-゜ノ) to a plain-text message": "在纯文字信息前添加 ┬──┬ ノ( ゜-゜ノ)",
     "Prepends (╯°□°）╯︵ ┻━┻ to a plain-text message": "在纯文字信息前添加 (╯°□°）╯︵ ┻━┻",
     "You're already in a call with this person.": "您与此人已处在通话中。",
-    "Already in call": "已在通话中"
+    "Already in call": "已在通话中",
+    "Navigate composer history": "浏览编辑区历史",
+    "Go to Home View": "转到主视图",
+    "Search (must be enabled)": "搜索（必须启用）",
+    "Your Security Key": "您的安全密钥",
+    "Use Security Key": "使用安全密钥",
+    "%(ssoButtons)s Or %(usernamePassword)s": "%(ssoButtons)s 或 %(usernamePassword)s",
+    "User settings": "用户设置",
+    "Creating rooms...": "正在创建聊天室…",
+    "Room name": "聊天室名称",
+    "Random": "随机",
+    "%(count)s members|one": "%(count)s 位成员",
+    "%(count)s members|other": "%(count)s 位成员",
+    "Default Rooms": "默认聊天室",
+    "Accept Invite": "接受邀请",
+    "Manage rooms": "管理聊天室",
+    "Save changes": "保存修改",
+    "Remove from Space": "从空间中移除",
+    "Undo": "撤销",
+    "Welcome %(name)s": "欢迎 %(name)s",
+    "Create community": "创建社区",
+    "Forgot password?": "忘记密码？",
+    "Enter Security Key": "输入安全密钥",
+    "Invalid Security Key": "安全密钥无效",
+    "Wrong Security Key": "安全密钥错误",
+    "Save Changes": "保存修改",
+    "Saving...": "正在保存…",
+    "View dev tools": "查看开发者工具",
+    "Leave Space": "离开空间",
+    "Space settings": "空间设置",
+    "Learn more": "了解更多",
+    "Other homeserver": "其他主服务器",
+    "Specify a homeserver": "指定主服务器",
+    "Transfer": "传输",
+    "Unnamed Space": "未命名空间",
+    "Cookie Policy": "Cookie 政策",
+    "Privacy Policy": "隐私政策",
+    "Abort": "放弃",
+    "Send feedback": "发送反馈",
+    "Report a bug": "反馈问题",
+    "Edit Values": "编辑值",
+    "Value:": "值：",
+    "Setting definition:": "设置定义：",
+    "Caution:": "警告：",
+    "Setting:": "设置：",
+    "Value": "值",
+    "Setting ID": "设置 ID",
+    "Enter name": "输入名称",
+    "Community ID: +<localpart />:%(domain)s": "社区 ID：+<localpart />:%(domain)s",
+    "Reason (optional)": "理由（可选）",
+    "Show": "显示",
+    "Apply": "应用",
+    "Applying...": "正在应用…",
+    "Create a new room": "创建新聊天室",
+    "Spaces": "空间",
+    "Continue with %(provider)s": "使用 %(provider)s 继续",
+    "Homeserver": "主服务器",
+    "Server Options": "服务器选项",
+    "Information": "信息",
+    "Windows": "窗口",
+    "Screens": "屏幕",
+    "Share your screen": "共享屏幕",
+    "Role": "角色",
+    "Not encrypted": "未加密",
+    "Unpin": "取消置顶",
+    "Empty room": "空聊天室",
+    "Add existing room": "添加现有的聊天室",
+    "Open dial pad": "打开拨号键盘",
+    "Start a Conversation": "开始对话",
+    "Show Widgets": "显示小挂件",
+    "Hide Widgets": "隐藏小挂件",
+    "%(displayName)s created this room.": "%(displayName)s 创建了此聊天室。",
+    "You created this room.": "你创建了此聊天室。",
+    "Remove messages sent by others": "移除其他人的消息",
+    "Sending your message...": "正在发送消息…",
+    "Encrypting your message...": "正在加密消息…",
+    "Send message": "发送消息",
+    "Invite to this space": "邀请至此空间",
+    "Your message was sent": "消息已发送",
+    "Back up your encryption keys with your account data in case you lose access to your sessions. Your keys will be secured with a unique Security Key.": "请使用您的帐户数据备份加密密钥，以免您无法访问您的会话。密钥将通过一个唯一的安全密钥进行保护。",
+    "Spell check dictionaries": "拼写检查字典",
+    "Failed to save your profile": "个人资料保存失败",
+    "The operation could not be completed": "操作无法完成",
+    "Space options": "空间选项",
+    "Space Home": "空间首页",
+    "New room": "新建聊天室",
+    "Leave space": "离开空间",
+    "Share your public space": "分享你的公共空间",
+    "Collapse space panel": "收起空间面板",
+    "Expand space panel": "展开空间面板",
+    "Create a space": "创建空间",
+    "Fill Screen": "填充屏幕",
+    "sends snowfall": "发送雪球",
+    "Sends the given message with snowfall": "附加雪球发送",
+    "sends confetti": "发送五彩纸屑",
+    "Sends the given message with confetti": "附加五彩纸屑发送",
+    "Sends the given message with fireworks": "附加烟火发送",
+    "sends fireworks": "发送烟火",
+    "Offline encrypted messaging using dehydrated devices": "需要离线设备（dehydrated devices）的加密消息离线传递",
+    "Spaces prototype. Incompatible with Communities, Communities v2 and Custom Tags. Requires compatible homeserver for some features.": "正在开发的空间功能的原型。与社区、社区 V2 和自定义标签功能不兼容。需要主服务器兼容才能使用某些功能。",
+    "The <b>%(capability)s</b> capability": "<b>%(capability)s</b> 容量",
+    "%(senderName)s has updated the widget layout": "%(senderName)s 已更新小挂件布局",
+    "Support": "支持",
+    "Your server does not support showing space hierarchies.": "您的服务器不支持显示空间层次结构。",
+    "This version of %(brand)s does not support searching encrypted messages": "当前版本的 %(brand)s 不支持搜索加密消息",
+    "This version of %(brand)s does not support viewing some encrypted files": "当前版本的 %(brand)s 不支持查看某些加密文件",
+    "Effects": "效果",
+    "Pakistan": "巴基斯坦",
+    "United Arab Emirates": "阿拉伯联合酋长国",
+    "Yemen": "也门",
+    "Ukraine": "乌克兰",
+    "Turkmenistan": "土库曼斯坦",
+    "Uganda": "乌干达",
+    "Turkey": "土耳其",
+    "U.S. Virgin Islands": "美属维尔京群岛",
+    "Taiwan": "台湾",
+    "Sweden": "瑞典",
+    "Spain": "西班牙",
+    "South Korea": "韩国",
+    "South Africa": "南非",
+    "Russia": "俄罗斯",
+    "Romania": "罗马尼亚",
+    "Philippines": "菲律宾",
+    "North Korea": "朝鲜",
+    "Norway": "挪威",
+    "New Zealand": "新西兰",
+    "Netherlands": "荷兰",
+    "Mexico": "墨西哥",
+    "Malaysia": "马来西亚",
+    "Macau": "澳门",
+    "Luxembourg": "卢森堡",
+    "Lebanon": "黎巴嫩",
+    "Lithuania": "立陶宛",
+    "Latvia": "拉脱维亚",
+    "Liechtenstein": "列支敦士登",
+    "Laos": "老挝",
+    "Libya": "利比亚",
+    "Liberia": "利比里亚",
+    "Japan": "日本",
+    "Jamaica": "牙买加",
+    "Italy": "意大利",
+    "Israel": "以色列",
+    "Ireland": "爱尔兰",
+    "Iraq": "伊拉克",
+    "Indonesia": "印度尼西亚",
+    "India": "印度",
+    "Iceland": "冰岛",
+    "Iran": "伊朗",
+    "Guatemala": "危地马拉",
+    "Guam": "关岛",
+    "Guadeloupe": "瓜德罗普",
+    "Grenada": "格林纳达",
+    "Greenland": "格陵兰",
+    "Greece": "希腊",
+    "Gibraltar": "直布罗陀",
+    "Ghana": "加纳",
+    "Germany": "德国",
+    "Georgia": "格鲁吉亚",
+    "Gambia": "冈比亚",
+    "Gabon": "加蓬",
+    "French Southern Territories": "法属南部领地",
+    "French Polynesia": "法属波利尼西亚",
+    "French Guiana": "法属圭亚那",
+    "France": "法国",
+    "Finland": "芬兰",
+    "Fiji": "斐济",
+    "Faroe Islands": "法罗群岛",
+    "Falkland Islands": "福克兰群岛",
+    "Ethiopia": "埃塞俄比亚",
+    "Estonia": "爱沙尼亚",
+    "Eritrea": "厄立特里亚",
+    "Equatorial Guinea": "赤道几内亚",
+    "El Salvador": "萨尔瓦多",
+    "Egypt": "埃及",
+    "Ecuador": "厄瓜多尔",
+    "Dominican Republic": "多明尼加共和国",
+    "Dominica": "多米尼加",
+    "Djibouti": "吉布提",
+    "Denmark": "丹麦",
+    "Côte d’Ivoire": "科特迪瓦",
+    "Czech Republic": "捷克共和国",
+    "Cyprus": "塞浦路斯",
+    "Curaçao": "库拉索",
+    "Cuba": "古巴",
+    "Croatia": "克罗地亚",
+    "Costa Rica": "哥斯达黎加"
 }

From 563403cee81f14506d8e101238f3bd128468099f Mon Sep 17 00:00:00 2001
From: RainSlide <RainSlide@outlook.com>
Date: Wed, 24 Mar 2021 13:18:58 +0000
Subject: [PATCH 403/420] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2889 of 2889 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
---
 src/i18n/strings/zh_Hant.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index e7d94be8e2..3a4e346761 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2742,7 +2742,7 @@
     "Gibraltar": "直布羅陀",
     "Ghana": "迦納",
     "Germany": "德國",
-    "Georgia": "喬治亞",
+    "Georgia": "格魯吉亞",
     "Gambia": "甘比亞",
     "Gabon": "加彭",
     "French Southern Territories": "法屬南部領地",
@@ -2760,11 +2760,11 @@
     "El Salvador": "薩爾瓦多",
     "Egypt": "埃及",
     "Ecuador": "厄瓜多",
-    "Dominican Republic": "多明尼加",
+    "Dominican Republic": "多明尼加共和國",
     "Dominica": "多米尼克",
     "Djibouti": "吉布地",
     "Denmark": "丹麥",
-    "Côte d’Ivoire": "象牙海岸",
+    "Côte d’Ivoire": "科特迪瓦",
     "Czech Republic": "捷克",
     "Cyprus": "賽普勒斯",
     "Curaçao": "古拉索",

From af0b4ef41083a71b7872cf5b2ae83c87ac303be6 Mon Sep 17 00:00:00 2001
From: BinotaLIU <me@binota.org>
Date: Sun, 21 Mar 2021 20:27:53 +0000
Subject: [PATCH 404/420] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2889 of 2889 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
---
 src/i18n/strings/zh_Hant.json | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 3a4e346761..6932b1ba9a 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -25,7 +25,7 @@
     "Click here to fix": "點擊這里修復",
     "Confirm password": "確認密碼",
     "Continue": "繼續",
-    "Create Room": "創建聊天室",
+    "Create Room": "建立聊天室",
     "Cryptography": "加密",
     "Current password": "當前密碼",
     "/ddg is not a command": "/ddg 不是一個命令",
@@ -109,7 +109,7 @@
     "Someone": "某人",
     "Submit": "提交",
     "Success": "成功",
-    "This email address is already in use": "這個電子郵件地址已被使用",
+    "This email address is already in use": "該電子郵件位址已被使用",
     "This email address was not found": "未找到此電子郵件地址",
     "The email address linked to your account must be entered.": "必須輸入和你帳號關聯的電子郵件地址。",
     "Unable to add email address": "無法新增電郵地址",
@@ -259,7 +259,7 @@
     "This room has no local addresses": "此房間沒有本機地址",
     "This room is not recognised.": "此聊天室不被認可。",
     "This doesn't appear to be a valid email address": "這似乎不是有效的電子郵件地址",
-    "This phone number is already in use": "這個電話號碼已在使用中",
+    "This phone number is already in use": "該電話號碼已被使用",
     "This room": "此房間",
     "This room is not accessible by remote Matrix servers": "此房間無法被遠端的 Matrix 伺服器存取",
     "To use it, just wait for autocomplete results to load and tab through them.": "要使用它，只要等待自動完成的結果載入並在它們上面按 Tab。",
@@ -625,7 +625,7 @@
     "Room Notification": "聊天室通知",
     "The information being sent to us to help make %(brand)s better includes:": "傳送給我們以協助改進 %(brand)s 的資訊包含了：",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "這個頁面包含了可識別的資訊，如聊天室、使用者或群組 ID，這些資料會在傳到伺服器前被刪除。",
-    "The platform you're on": "您使用的平臺是",
+    "The platform you're on": "您使用的平台是",
     "The version of %(brand)s": "%(brand)s 版本",
     "Your language of choice": "您選擇的語言",
     "Which officially provided instance you are using, if any": "您正在使用的任何官方實體，如果有的話",
@@ -1520,8 +1520,8 @@
     "Create a private room": "建立私人聊天室",
     "Topic (optional)": "主題（選擇性）",
     "Make this room public": "讓聊天室公開",
-    "Hide advanced": "隱藏進階的",
-    "Show advanced": "顯示進階的",
+    "Hide advanced": "隱藏進階",
+    "Show advanced": "顯示進階",
     "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "阻擋其他 matrix 伺服器上的使用加入此聊天室（此設定無法在之後變更！）",
     "Close dialog": "關閉對話框",
     "To continue you need to accept the terms of this service.": "要繼續，您必須同意本服務的條款。",
@@ -1543,7 +1543,7 @@
     "Click the link in the email you received to verify and then click continue again.": "點擊您收到的電子郵件中的連結以驗證然後再次點擊繼續。",
     "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|one": "您將要移除 %(user)s 的 1 則訊息。這無法復原。您想要繼續嗎？",
     "Remove %(count)s messages|one": "移除 1 則訊息",
-    "Add Email Address": "新增電子郵件地址",
+    "Add Email Address": "新增電子郵件位址",
     "Add Phone Number": "新增電話號碼",
     "%(creator)s created and configured the room.": "%(creator)s 建立並設定了聊天室。",
     "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.": "您應該在斷線前從身份識別伺服器 <idserver /> 上<b>移除您的個人資料</b>。不幸的是，身份識別伺服器 <idserver /> 目前離線中或無法連線。",
@@ -1847,7 +1847,7 @@
     "Bridges": "橋接",
     "This user has not verified all of their sessions.": "此使用者尚未驗證他們的所有工作階段。",
     "You have verified this user. This user has verified all of their sessions.": "您已驗證此使用者。此使用者已驗證他們所有的工作階段。",
-    "Someone is using an unknown session": "某人正仔使用未知的工作階段",
+    "Someone is using an unknown session": "某人正在使用未知的工作階段",
     "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.": "如果您的其他工作階段沒有此訊息的金鑰，您就無法解密它們。",
@@ -2079,11 +2079,11 @@
     "Sends a message as html, without interpreting it as markdown": "以 html 形式傳送訊息，不將其翻譯為 markdown",
     "Cancel replying to a message": "取消回覆訊息",
     "Sign in with SSO": "使用單一登入系統登入",
-    "Use Single Sign On to continue": "使用單一登入繼續",
-    "Confirm adding this email address by using Single Sign On to prove your identity.": "透過使用單一登入來證明您的身份以確認新增此電子郵件地址。",
+    "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.": "點擊下方按鈕以確認新增此電子郵件地址。",
+    "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.": "點擊下方按鈕以確認新增此電話號碼。",

From 1f489662fb9d61e6ac81ca35c2b17f5b913d5a8b Mon Sep 17 00:00:00 2001
From: waclaw66 <waclaw66@seznam.cz>
Date: Mon, 22 Mar 2021 20:31:02 +0000
Subject: [PATCH 405/420] Translated using Weblate (Czech)

Currently translated at 100.0% (2889 of 2889 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-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 90941ced30..0efb3df22a 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -50,7 +50,7 @@
     "unknown error code": "neznámý kód chyby",
     "OK": "OK",
     "Failed to forget room %(errCode)s": "Nepodařilo se zapomenout místnost %(errCode)s",
-    "Dismiss": "Zahodit",
+    "Dismiss": "Zavřít",
     "powered by Matrix": "používá protokol Matrix",
     "Custom Server Options": "Vlastní nastavení serveru",
     "Add a widget": "Přidat widget",

From 8e33e0343dcc1a064a36ca0b38cad9157380578d Mon Sep 17 00:00:00 2001
From: Graeme Power <gjpower@tcd.ie>
Date: Mon, 22 Mar 2021 17:44:49 +0000
Subject: [PATCH 406/420] Translated using Weblate (Irish)

Currently translated at 23.2% (671 of 2889 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ga/
---
 src/i18n/strings/ga.json | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/ga.json b/src/i18n/strings/ga.json
index 4580e538ce..c98107b767 100644
--- a/src/i18n/strings/ga.json
+++ b/src/i18n/strings/ga.json
@@ -3,7 +3,7 @@
     "Signing In...": "ag Síniú Isteach…",
     "Sign in": "Sínigh Isteach",
     "Already have an account? <a>Sign in here</a>": "An bhfuil cuntas agat cheana? <a>Sínigh isteach anseo</a>",
-    "Show less": "Taispeái níos lú",
+    "Show less": "Taispeáin níos lú",
     "Show more": "Taispeáin níos mó",
     "Show %(count)s more|one": "Taispeáin %(count)s níos mó",
     "Show %(count)s more|other": "Taispeáin %(count)s níos mó",
@@ -662,5 +662,14 @@
     "Dismiss": "Cuir uait",
     "Use Single Sign On to continue": "Lean ar aghaidh le SSO",
     "This phone number is already in use": "Úsáidtear an uimhir ghutháin seo chean féin",
-    "This email address is already in use": "Úsáidtear an seoladh ríomhphoist seo chean féin"
+    "This email address is already in use": "Úsáidtear an seoladh ríomhphoist seo chean féin",
+    "Sign out and remove encryption keys?": "Sínigh amach agus scrios eochracha criptiúcháin?",
+    "Clear Storage and Sign Out": "Scrios Stóras agus Sínigh Amach",
+    "You're signed out": "Tá tú sínithe amach",
+    "Sign out": "Sínigh amach",
+    "Are you sure you want to sign out?": "An bhfuil tú cinnte go dteastaíonn uait sínigh amach?",
+    "Signed Out": "Sínithe Amach",
+    "Unable to query for supported registration methods.": "Ní féidir iarratas a dhéanamh faoi modhanna cláraithe tacaithe.",
+    "Host account on": "Óstáil cuntas ar",
+    "Create account": "Déan cuntas a chruthú"
 }

From f340b8f7edfb339cf4c168bdeaf5e73c27d273b4 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 24 Mar 2021 16:42:21 +0000
Subject: [PATCH 407/420] Set invite PL requirement for public spaces to 0
 explicitly

---
 src/components/views/spaces/SpaceCreateMenu.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/views/spaces/SpaceCreateMenu.tsx b/src/components/views/spaces/SpaceCreateMenu.tsx
index 6269de1c50..9ee6edc489 100644
--- a/src/components/views/spaces/SpaceCreateMenu.tsx
+++ b/src/components/views/spaces/SpaceCreateMenu.tsx
@@ -88,6 +88,7 @@ const SpaceCreateMenu = ({ onFinished }) => {
                     power_level_content_override: {
                         // Only allow Admins to write to the timeline to prevent hidden sync spam
                         events_default: 100,
+                        ...Visibility.Public ? { invite: 0 } : {},
                     },
                 },
                 spinner: false,

From 56dbd5f628713816cfdc7773716b41dc5bcb6eb5 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 24 Mar 2021 16:45:53 +0000
Subject: [PATCH 408/420] Remove unused autoJoin prop and move viaServers logic
 into RVS

this fixes the issue where autoJoining ignored viaServers
---
 src/components/structures/LoggedInView.tsx |  6 ------
 src/components/structures/MatrixChat.tsx   |  2 --
 src/components/structures/RoomView.tsx     | 10 ++--------
 src/stores/RoomViewStore.tsx               |  5 ++++-
 4 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx
index 60a2bf4ada..20a3b811c5 100644
--- a/src/components/structures/LoggedInView.tsx
+++ b/src/components/structures/LoggedInView.tsx
@@ -74,7 +74,6 @@ function canElementReceiveInput(el) {
 interface IProps {
     matrixClient: MatrixClient;
     onRegistered: (credentials: IMatrixClientCreds) => Promise<MatrixClient>;
-    viaServers?: string[];
     hideToSRUsers: boolean;
     resizeNotifier: ResizeNotifier;
     // eslint-disable-next-line camelcase
@@ -143,9 +142,6 @@ class LoggedInView extends React.Component<IProps, IState> {
         // transitioned to PWLU)
         onRegistered: PropTypes.func,
 
-        // Used by the RoomView to handle joining rooms
-        viaServers: PropTypes.arrayOf(PropTypes.string),
-
         // and lots and lots of other stuff.
     };
 
@@ -625,11 +621,9 @@ class LoggedInView extends React.Component<IProps, IState> {
             case PageTypes.RoomView:
                 pageElement = <RoomView
                     ref={this._roomView}
-                    autoJoin={this.props.autoJoin}
                     onRegistered={this.props.onRegistered}
                     threepidInvite={this.props.threepidInvite}
                     oobData={this.props.roomOobData}
-                    viaServers={this.props.viaServers}
                     key={this.props.currentRoomId || 'roomview'}
                     resizeNotifier={this.props.resizeNotifier}
                     justCreatedOpts={this.props.roomJustCreatedOpts}
diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index ac1842c7fd..689561fd60 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -202,7 +202,6 @@ interface IState {
     ready: boolean;
     threepidInvite?: IThreepidInvite,
     roomOobData?: object;
-    viaServers?: string[];
     pendingInitialSync?: boolean;
     justRegistered?: boolean;
     roomJustCreatedOpts?: IOpts;
@@ -929,7 +928,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 page_type: PageTypes.RoomView,
                 threepidInvite: roomInfo.threepid_invite,
                 roomOobData: roomInfo.oob_data,
-                viaServers: roomInfo.via_servers,
                 ready: true,
                 roomJustCreatedOpts: roomInfo.justCreatedOpts,
             }, () => {
diff --git a/src/components/structures/RoomView.tsx b/src/components/structures/RoomView.tsx
index 706cd5ded8..8a9c7cabd9 100644
--- a/src/components/structures/RoomView.tsx
+++ b/src/components/structures/RoomView.tsx
@@ -112,10 +112,6 @@ interface IProps {
         inviterName?: string;
     };
 
-    // Servers the RoomView can use to try and assist joins
-    viaServers?: string[];
-
-    autoJoin?: boolean;
     resizeNotifier: ResizeNotifier;
     justCreatedOpts?: IOpts;
 
@@ -450,9 +446,7 @@ export default class RoomView extends React.Component<IProps, IState> {
         // now not joined because the js-sdk peeking API will clobber our historical room,
         // making it impossible to indicate a newly joined room.
         if (!joining && roomId) {
-            if (this.props.autoJoin) {
-                this.onJoinButtonClicked();
-            } else if (!room && shouldPeek) {
+            if (!room && shouldPeek) {
                 console.info("Attempting to peek into room %s", roomId);
                 this.setState({
                     peekLoading: true,
@@ -1123,7 +1117,7 @@ export default class RoomView extends React.Component<IProps, IState> {
                 const signUrl = this.props.threepidInvite?.signUrl;
                 dis.dispatch({
                     action: 'join_room',
-                    opts: { inviteSignUrl: signUrl, viaServers: this.props.viaServers },
+                    opts: { inviteSignUrl: signUrl },
                     _type: "unknown", // TODO: instrumentation
                 });
                 return Promise.resolve();
diff --git a/src/stores/RoomViewStore.tsx b/src/stores/RoomViewStore.tsx
index f4c0c1b15c..601c77cdf3 100644
--- a/src/stores/RoomViewStore.tsx
+++ b/src/stores/RoomViewStore.tsx
@@ -273,7 +273,10 @@ class RoomViewStore extends Store<ActionPayload> {
         const cli = MatrixClientPeg.get();
         const address = this.state.roomAlias || this.state.roomId;
         try {
-            await retry<void, MatrixError>(() => cli.joinRoom(address, payload.opts), NUM_JOIN_RETRY, (err) => {
+            await retry<void, MatrixError>(() => cli.joinRoom(address, {
+                viaServers: payload.via_servers,
+                ...payload.opts,
+            }), NUM_JOIN_RETRY, (err) => {
                 // if we received a Gateway timeout then retry
                 return err.httpStatus === 504;
             });

From d9f3e70b0bf165ff809d05e4294557cf6ea7ded5 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 24 Mar 2021 16:46:30 +0000
Subject: [PATCH 409/420] Fix joining over federation from Space Home (via
 servers)

---
 src/components/structures/SpaceRoomView.tsx | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/components/structures/SpaceRoomView.tsx b/src/components/structures/SpaceRoomView.tsx
index 16028f0975..06b4fe5983 100644
--- a/src/components/structures/SpaceRoomView.tsx
+++ b/src/components/structures/SpaceRoomView.tsx
@@ -258,20 +258,26 @@ const SpaceLanding = ({ space }) => {
         </AccessibleButton>;
     }
 
-    const [loading, roomsMap, relations, numRooms] = useAsyncMemo(async () => {
+    const [loading, roomsMap, relations, viaMap, numRooms] = useAsyncMemo(async () => {
         try {
             const data = await cli.getSpaceSummary(space.roomId, undefined, myMembership !== "join");
 
             const parentChildRelations = new EnhancedMap<string, Map<string, ISpaceSummaryEvent>>();
+            const viaMap = new EnhancedMap<string, Set<string>>();
             data.events.map((ev: ISpaceSummaryEvent) => {
                 if (ev.type === EventType.SpaceChild) {
                     parentChildRelations.getOrCreate(ev.room_id, new Map()).set(ev.state_key, ev);
                 }
+
+                if (Array.isArray(ev.content["via"])) {
+                    const set = viaMap.getOrCreate(ev.state_key, new Set());
+                    ev.content["via"].forEach(via => set.add(via));
+                }
             });
 
             const roomsMap = new Map<string, ISpaceSummaryRoom>(data.rooms.map(r => [r.room_id, r]));
             const numRooms = data.rooms.filter(r => r.room_type !== RoomType.Space).length;
-            return [false, roomsMap, parentChildRelations, numRooms];
+            return [false, roomsMap, parentChildRelations, viaMap, numRooms];
         } catch (e) {
             console.error(e); // TODO
         }
@@ -292,7 +298,7 @@ const SpaceLanding = ({ space }) => {
                 relations={relations}
                 parents={new Set()}
                 onViewRoomClick={(roomId, autoJoin) => {
-                    showRoom(roomsMap.get(roomId), [], autoJoin);
+                    showRoom(roomsMap.get(roomId), Array.from(viaMap.get(roomId) || []), autoJoin);
                 }}
             />
         </AutoHideScrollbar>;

From 6d9496cc224fbfe23c29800b9fe24aadc7e14906 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 24 Mar 2021 17:02:12 +0000
Subject: [PATCH 410/420] Consolidate space summary api logic between space
 room view and directory

---
 .../structures/SpaceRoomDirectory.tsx         | 51 +++++++++++--------
 src/components/structures/SpaceRoomView.tsx   | 43 +++++-----------
 2 files changed, 44 insertions(+), 50 deletions(-)

diff --git a/src/components/structures/SpaceRoomDirectory.tsx b/src/components/structures/SpaceRoomDirectory.tsx
index 877a4283f1..0dfb33379d 100644
--- a/src/components/structures/SpaceRoomDirectory.tsx
+++ b/src/components/structures/SpaceRoomDirectory.tsx
@@ -15,7 +15,8 @@ limitations under the License.
 */
 
 import React, {useMemo, useState} from "react";
-import Room from "matrix-js-sdk/src/models/room";
+import {Room} from "matrix-js-sdk/src/models/room";
+import {MatrixClient} from "matrix-js-sdk/src/client";
 import {EventType, RoomType} from "matrix-js-sdk/src/@types/event";
 import classNames from "classnames";
 import {sortBy} from "lodash";
@@ -232,7 +233,7 @@ export const showRoom = (room: ISpaceSummaryRoom, viaServers?: string[], autoJoi
 interface IHierarchyLevelProps {
     spaceId: string;
     rooms: Map<string, ISpaceSummaryRoom>;
-    relations: EnhancedMap<string, Map<string, ISpaceSummaryEvent>>;
+    relations: Map<string, Map<string, ISpaceSummaryEvent>>;
     parents: Set<string>;
     selectedMap?: Map<string, Set<string>>;
     onViewRoomClick(roomId: string, autoJoin: boolean): void;
@@ -308,23 +309,15 @@ export const HierarchyLevel = ({
     </React.Fragment>
 };
 
-const SpaceRoomDirectory: React.FC<IProps> = ({ space, initialText = "", onFinished }) => {
+// mutate argument refreshToken to force a reload
+export const useSpaceSummary = (cli: MatrixClient, space: Room, refreshToken?: any): [
+    ISpaceSummaryRoom[],
+    Map<string, Map<string, ISpaceSummaryEvent>>,
+    Map<string, Set<string>>,
+    Map<string, Set<string>>,
+] | [] => {
     // TODO pagination
-    const cli = MatrixClientPeg.get();
-    const userId = cli.getUserId();
-    const [query, setQuery] = useState(initialText);
-
-    const onCreateRoomClick = () => {
-        dis.dispatch({
-            action: 'view_create_room',
-            public: true,
-        });
-        onFinished();
-    };
-
-    const [selected, setSelected] = useState(new Map<string, Set<string>>()); // Map<parentId, Set<childId>>
-
-    const [rooms, parentChildMap, childParentMap, viaMap] = useAsyncMemo(async () => {
+    return useAsyncMemo(async () => {
         try {
             const data = await cli.getSpaceSummary(space.roomId);
 
@@ -342,13 +335,31 @@ const SpaceRoomDirectory: React.FC<IProps> = ({ space, initialText = "", onFinis
                 }
             });
 
-            return [data.rooms as ISpaceSummaryRoom[], parentChildRelations, childParentRelations, viaMap];
+            return [data.rooms as ISpaceSummaryRoom[], parentChildRelations, viaMap, childParentRelations];
         } catch (e) {
             console.error(e); // TODO
         }
 
         return [];
-    }, [space], []);
+    }, [space, refreshToken], []);
+};
+
+const SpaceRoomDirectory: React.FC<IProps> = ({ space, initialText = "", onFinished }) => {
+    const cli = MatrixClientPeg.get();
+    const userId = cli.getUserId();
+    const [query, setQuery] = useState(initialText);
+
+    const onCreateRoomClick = () => {
+        dis.dispatch({
+            action: 'view_create_room',
+            public: true,
+        });
+        onFinished();
+    };
+
+    const [selected, setSelected] = useState(new Map<string, Set<string>>()); // Map<parentId, Set<childId>>
+
+    const [rooms, parentChildMap, viaMap, childParentMap] = useSpaceSummary(cli, space);
 
     const roomsMap = useMemo(() => {
         if (!rooms) return null;
diff --git a/src/components/structures/SpaceRoomView.tsx b/src/components/structures/SpaceRoomView.tsx
index 06b4fe5983..3ef10363b9 100644
--- a/src/components/structures/SpaceRoomView.tsx
+++ b/src/components/structures/SpaceRoomView.tsx
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {RefObject, useContext, useRef, useState} from "react";
+import React, {RefObject, useContext, useMemo, useRef, useState} from "react";
 import {EventType, RoomType} from "matrix-js-sdk/src/@types/event";
 import {Room} from "matrix-js-sdk/src/models/room";
 import {EventSubscription} from "fbemitter";
@@ -46,7 +46,7 @@ import {SetRightPanelPhasePayload} from "../../dispatcher/payloads/SetRightPanel
 import {useStateArray} from "../../hooks/useStateArray";
 import SpacePublicShare from "../views/spaces/SpacePublicShare";
 import {showAddExistingRooms, showCreateNewRoom, shouldShowSpaceSettings, showSpaceSettings} from "../../utils/space";
-import {HierarchyLevel, ISpaceSummaryEvent, ISpaceSummaryRoom, showRoom} from "./SpaceRoomDirectory";
+import {HierarchyLevel, ISpaceSummaryEvent, ISpaceSummaryRoom, showRoom, useSpaceSummary} from "./SpaceRoomDirectory";
 import {useAsyncMemo} from "../../hooks/useAsyncMemo";
 import {EnhancedMap} from "../../utils/maps";
 import AutoHideScrollbar from "./AutoHideScrollbar";
@@ -228,7 +228,7 @@ const SpaceLanding = ({ space }) => {
 
     const canAddRooms = myMembership === "join" && space.currentState.maySendStateEvent(EventType.SpaceChild, userId);
 
-    const [_, forceUpdate] = useStateToggle(false); // TODO
+    const [refreshToken, forceUpdate] = useStateToggle(false);
 
     let addRoomButtons;
     if (canAddRooms) {
@@ -258,32 +258,13 @@ const SpaceLanding = ({ space }) => {
         </AccessibleButton>;
     }
 
-    const [loading, roomsMap, relations, viaMap, numRooms] = useAsyncMemo(async () => {
-        try {
-            const data = await cli.getSpaceSummary(space.roomId, undefined, myMembership !== "join");
-
-            const parentChildRelations = new EnhancedMap<string, Map<string, ISpaceSummaryEvent>>();
-            const viaMap = new EnhancedMap<string, Set<string>>();
-            data.events.map((ev: ISpaceSummaryEvent) => {
-                if (ev.type === EventType.SpaceChild) {
-                    parentChildRelations.getOrCreate(ev.room_id, new Map()).set(ev.state_key, ev);
-                }
-
-                if (Array.isArray(ev.content["via"])) {
-                    const set = viaMap.getOrCreate(ev.state_key, new Set());
-                    ev.content["via"].forEach(via => set.add(via));
-                }
-            });
-
-            const roomsMap = new Map<string, ISpaceSummaryRoom>(data.rooms.map(r => [r.room_id, r]));
-            const numRooms = data.rooms.filter(r => r.room_type !== RoomType.Space).length;
-            return [false, roomsMap, parentChildRelations, viaMap, numRooms];
-        } catch (e) {
-            console.error(e); // TODO
-        }
-
-        return [false];
-    }, [space, _], [true]);
+    const [rooms, relations, viaMap] = useSpaceSummary(cli, space, refreshToken);
+    const [roomsMap, numRooms] = useMemo(() => {
+        if (!rooms) return [];
+        const roomsMap = new Map<string, ISpaceSummaryRoom>(rooms.map(r => [r.room_id, r]));
+        const numRooms = rooms.filter(r => r.room_type !== RoomType.Space).length;
+        return [roomsMap, numRooms];
+    }, [rooms]);
 
     let previewRooms;
     if (roomsMap) {
@@ -302,7 +283,7 @@ const SpaceLanding = ({ space }) => {
                 }}
             />
         </AutoHideScrollbar>;
-    } else if (loading) {
+    } else if (!rooms) {
         previewRooms = <InlineSpinner />;
     } else {
         previewRooms = <p>{_t("Your server does not support showing space hierarchies.")}</p>;
@@ -647,6 +628,8 @@ export default class SpaceRoomView extends React.PureComponent<IProps, IState> {
     };
 
     private goToFirstRoom = async () => {
+        // TODO actually go to the first room
+
         const childRooms = SpaceStore.instance.getChildRooms(this.props.space.roomId);
         if (childRooms.length) {
             const room = childRooms[0];

From ee5d0d68421f0510d8a084f77954a9869e9e67a4 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 24 Mar 2021 17:05:21 +0000
Subject: [PATCH 411/420] Fix alignment bug with space panel on spaces with
 subspaces in Chrome

---
 res/css/structures/_SpacePanel.scss            | 3 ---
 src/components/views/spaces/SpaceTreeLevel.tsx | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/res/css/structures/_SpacePanel.scss b/res/css/structures/_SpacePanel.scss
index ffe67ce6ab..33f4dc0588 100644
--- a/res/css/structures/_SpacePanel.scss
+++ b/res/css/structures/_SpacePanel.scss
@@ -146,9 +146,6 @@ $activeBorderColor: $secondary-fg-color;
 
         .mx_SpaceButton_toggleCollapse {
             width: $gutterSize;
-            // negative margin to place it correctly even with the complex
-            // 4px selection border each space button has when active
-            margin-right: -4px;
             height: 20px;
             mask-position: center;
             mask-size: 20px;
diff --git a/src/components/views/spaces/SpaceTreeLevel.tsx b/src/components/views/spaces/SpaceTreeLevel.tsx
index 1b86bb7898..1da6720eea 100644
--- a/src/components/views/spaces/SpaceTreeLevel.tsx
+++ b/src/components/views/spaces/SpaceTreeLevel.tsx
@@ -37,7 +37,7 @@ import {
     showSpaceSettings,
 } from "../../../utils/space";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
-import {ButtonEvent} from "../elements/AccessibleButton";
+import AccessibleButton, {ButtonEvent} from "../elements/AccessibleButton";
 import defaultDispatcher from "../../../dispatcher/dispatcher";
 import Modal from "../../../Modal";
 import SpacePublicShare from "./SpacePublicShare";
@@ -353,7 +353,7 @@ export class SpaceItem extends React.PureComponent<IItemProps, IItemState> {
         const avatarSize = isNested ? 24 : 32;
 
         const toggleCollapseButton = childSpaces && childSpaces.length ?
-            <button
+            <AccessibleButton
                 className="mx_SpaceButton_toggleCollapse"
                 onClick={evt => this.toggleCollapse(evt)}
             /> : null;

From 8369d42dd014a06663e3ecfa6692120e09b55bca Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 24 Mar 2021 19:43:09 +0000
Subject: [PATCH 412/420] Hoist activeSpace tracking from RoomList to LeftPanel

---
 src/components/structures/LeftPanel.tsx | 14 +++++++++++++-
 src/components/views/rooms/RoomList.tsx | 25 +++++++++----------------
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/src/components/structures/LeftPanel.tsx b/src/components/structures/LeftPanel.tsx
index f46319235a..eb21301738 100644
--- a/src/components/structures/LeftPanel.tsx
+++ b/src/components/structures/LeftPanel.tsx
@@ -16,9 +16,11 @@ limitations under the License.
 
 import * as React from "react";
 import { createRef } from "react";
+import classNames from "classnames";
+import { Room } from "matrix-js-sdk/src/models/room";
+
 import GroupFilterPanel from "./GroupFilterPanel";
 import CustomRoomTagPanel from "./CustomRoomTagPanel";
-import classNames from "classnames";
 import dis from "../../dispatcher/dispatcher";
 import { _t } from "../../languageHandler";
 import RoomList from "../views/rooms/RoomList";
@@ -40,6 +42,7 @@ import RoomListNumResults from "../views/rooms/RoomListNumResults";
 import LeftPanelWidget from "./LeftPanelWidget";
 import {replaceableComponent} from "../../utils/replaceableComponent";
 import {mediaFromMxc} from "../../customisations/Media";
+import SpaceStore, {UPDATE_SELECTED_SPACE} from "../../stores/SpaceStore";
 
 interface IProps {
     isMinimized: boolean;
@@ -49,6 +52,7 @@ interface IProps {
 interface IState {
     showBreadcrumbs: boolean;
     showGroupFilterPanel: boolean;
+    activeSpace?: Room;
 }
 
 // List of CSS classes which should be included in keyboard navigation within the room list
@@ -74,11 +78,13 @@ export default class LeftPanel extends React.Component<IProps, IState> {
         this.state = {
             showBreadcrumbs: BreadcrumbsStore.instance.visible,
             showGroupFilterPanel: SettingsStore.getValue('TagPanel.enableTagPanel'),
+            activeSpace: SpaceStore.instance.activeSpace,
         };
 
         BreadcrumbsStore.instance.on(UPDATE_EVENT, this.onBreadcrumbsUpdate);
         RoomListStore.instance.on(LISTS_UPDATE_EVENT, this.onBreadcrumbsUpdate);
         OwnProfileStore.instance.on(UPDATE_EVENT, this.onBackgroundImageUpdate);
+        SpaceStore.instance.on(UPDATE_SELECTED_SPACE, this.updateActiveSpace);
         this.bgImageWatcherRef = SettingsStore.watchSetting(
             "RoomList.backgroundImage", null, this.onBackgroundImageUpdate);
         this.groupFilterPanelWatcherRef = SettingsStore.watchSetting("TagPanel.enableTagPanel", null, () => {
@@ -96,9 +102,14 @@ export default class LeftPanel extends React.Component<IProps, IState> {
         BreadcrumbsStore.instance.off(UPDATE_EVENT, this.onBreadcrumbsUpdate);
         RoomListStore.instance.off(LISTS_UPDATE_EVENT, this.onBreadcrumbsUpdate);
         OwnProfileStore.instance.off(UPDATE_EVENT, this.onBackgroundImageUpdate);
+        SpaceStore.instance.off(UPDATE_SELECTED_SPACE, this.updateActiveSpace);
         this.props.resizeNotifier.off("middlePanelResizedNoisy", this.onResize);
     }
 
+    private updateActiveSpace = (activeSpace: Room) => {
+        this.setState({ activeSpace });
+    };
+
     private onExplore = () => {
         dis.fire(Action.ViewRoomDirectory);
     };
@@ -407,6 +418,7 @@ export default class LeftPanel extends React.Component<IProps, IState> {
             onBlur={this.onBlur}
             isMinimized={this.props.isMinimized}
             onResize={this.onResize}
+            activeSpace={this.state.activeSpace}
         />;
 
         const containerClasses = classNames({
diff --git a/src/components/views/rooms/RoomList.tsx b/src/components/views/rooms/RoomList.tsx
index 01affc8b2f..d7fbe0b4df 100644
--- a/src/components/views/rooms/RoomList.tsx
+++ b/src/components/views/rooms/RoomList.tsx
@@ -66,13 +66,13 @@ interface IProps {
     onResize: () => void;
     resizeNotifier: ResizeNotifier;
     isMinimized: boolean;
+    activeSpace: Room;
 }
 
 interface IState {
     sublists: ITagMap;
     isNameFiltering: boolean;
     currentRoomId?: string;
-    activeSpace: Room;
     suggestedRooms: ISpaceSummaryRoom[];
 }
 
@@ -200,7 +200,7 @@ const TAG_AESTHETICS: ITagAestheticsMap = {
                     />
                     <IconizedContextMenuOption
                         label={_t("Explore rooms")}
-                        iconClassName="mx_RoomList_iconExplore"
+                        iconClassName="mx_RoomList_iconBrowse"
                         onClick={(e) => {
                             e.preventDefault();
                             e.stopPropagation();
@@ -287,7 +287,6 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
         this.state = {
             sublists: {},
             isNameFiltering: !!RoomListStore.instance.getFirstNameFilterCondition(),
-            activeSpace: SpaceStore.instance.activeSpace,
             suggestedRooms: SpaceStore.instance.suggestedRooms,
         };
 
@@ -300,7 +299,6 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
     }
 
     public componentDidMount(): void {
-        SpaceStore.instance.on(UPDATE_SELECTED_SPACE, this.updateActiveSpace);
         SpaceStore.instance.on(SUGGESTED_ROOMS, this.updateSuggestedRooms);
         RoomListStore.instance.on(LISTS_UPDATE_EVENT, this.updateLists);
         this.customTagStoreRef = CustomRoomTagStore.addListener(this.updateLists);
@@ -308,7 +306,6 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
     }
 
     public componentWillUnmount() {
-        SpaceStore.instance.off(UPDATE_SELECTED_SPACE, this.updateActiveSpace);
         SpaceStore.instance.off(SUGGESTED_ROOMS, this.updateSuggestedRooms);
         RoomListStore.instance.off(LISTS_UPDATE_EVENT, this.updateLists);
         defaultDispatcher.unregister(this.dispatcherRef);
@@ -374,10 +371,6 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
         return room;
     };
 
-    private updateActiveSpace = (activeSpace: Room) => {
-        this.setState({ activeSpace });
-    };
-
     private updateSuggestedRooms = (suggestedRooms: ISpaceSummaryRoom[]) => {
         this.setState({ suggestedRooms });
     };
@@ -438,12 +431,12 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
 
     private onSpaceInviteClick = () => {
         const initialText = RoomListStore.instance.getFirstNameFilterCondition()?.search;
-        if (this.state.activeSpace.getJoinRule() === "public") {
+        if (this.props.activeSpace.getJoinRule() === "public") {
             const modal = Modal.createTrackedDialog("Space Invite", "User Menu", InfoDialog, {
-                title: _t("Invite to %(spaceName)s", { spaceName: this.state.activeSpace.name }),
+                title: _t("Invite to %(spaceName)s", { spaceName: this.props.activeSpace.name }),
                 description: <React.Fragment>
                     <span>{ _t("Share your public space") }</span>
-                    <SpacePublicShare space={this.state.activeSpace} onFinished={() => modal.close()} />
+                    <SpacePublicShare space={this.props.activeSpace} onFinished={() => modal.close()} />
                 </React.Fragment>,
                 fixedWidth: false,
                 button: false,
@@ -451,7 +444,7 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
                 hasCloseButton: true,
             });
         } else {
-            showRoomInviteDialog(this.state.activeSpace.roomId, initialText);
+            showRoomInviteDialog(this.props.activeSpace.roomId, initialText);
         }
     };
 
@@ -600,13 +593,13 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
                         kind="link"
                         onClick={this.onExplore}
                     >
-                        { this.state.activeSpace ? _t("Explore rooms") : _t("Explore all public rooms") }
+                        { this.props.activeSpace ? _t("Explore rooms") : _t("Explore all public rooms") }
                     </AccessibleButton>
                 </div>;
-            } else if (this.state.activeSpace) {
+            } else if (this.props.activeSpace) {
                 explorePrompt = <div className="mx_RoomList_explorePrompt">
                     <div>{ _t("Quick actions") }</div>
-                    { this.state.activeSpace.canInvite(MatrixClientPeg.get().getUserId()) && <AccessibleButton
+                    { this.props.activeSpace.canInvite(MatrixClientPeg.get().getUserId()) && <AccessibleButton
                         className="mx_RoomList_explorePrompt_spaceInvite"
                         onClick={this.onSpaceInviteClick}
                     >

From 20ea1436fcb2631f376eec73d3bd87cdf5d1e607 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 24 Mar 2021 19:43:33 +0000
Subject: [PATCH 413/420] Update iconography for spaces

---
 res/css/structures/_LeftPanel.scss             | 4 ++++
 res/css/structures/_SpacePanel.scss            | 8 ++++++--
 res/css/views/rooms/_RoomList.scss             | 3 +++
 src/components/structures/LeftPanel.tsx        | 4 +++-
 src/components/views/spaces/SpaceTreeLevel.tsx | 2 +-
 5 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/res/css/structures/_LeftPanel.scss b/res/css/structures/_LeftPanel.scss
index 10357117da..7c3cd1c513 100644
--- a/res/css/structures/_LeftPanel.scss
+++ b/res/css/structures/_LeftPanel.scss
@@ -130,6 +130,10 @@ $roomListCollapsedWidth: 68px;
                     mask-repeat: no-repeat;
                     background: $secondary-fg-color;
                 }
+
+                &.mx_LeftPanel_exploreButton_space::before {
+                    mask-image: url('$(res)/img/element-icons/roomlist/browse.svg');
+                }
             }
         }
 
diff --git a/res/css/structures/_SpacePanel.scss b/res/css/structures/_SpacePanel.scss
index 33f4dc0588..5cca4aca11 100644
--- a/res/css/structures/_SpacePanel.scss
+++ b/res/css/structures/_SpacePanel.scss
@@ -339,11 +339,15 @@ $activeBorderColor: $secondary-fg-color;
     }
 
     .mx_SpacePanel_iconPlus::before {
-        mask-image: url('$(res)/img/element-icons/plus.svg');
+        mask-image: url('$(res)/img/element-icons/roomlist/plus-circle.svg');
+    }
+
+    .mx_SpacePanel_iconHash::before {
+        mask-image: url('$(res)/img/element-icons/roomlist/hash-circle.svg');
     }
 
     .mx_SpacePanel_iconExplore::before {
-        mask-image: url('$(res)/img/element-icons/roomlist/explore.svg');
+        mask-image: url('$(res)/img/element-icons/roomlist/browse.svg');
     }
 }
 
diff --git a/res/css/views/rooms/_RoomList.scss b/res/css/views/rooms/_RoomList.scss
index 641b434af4..22440fa6db 100644
--- a/res/css/views/rooms/_RoomList.scss
+++ b/res/css/views/rooms/_RoomList.scss
@@ -27,6 +27,9 @@ limitations under the License.
 .mx_RoomList_iconExplore::before {
     mask-image: url('$(res)/img/element-icons/roomlist/explore.svg');
 }
+.mx_RoomList_iconBrowse::before {
+    mask-image: url('$(res)/img/element-icons/roomlist/browse.svg');
+}
 .mx_RoomList_iconDialpad::before {
     mask-image: url('$(res)/img/element-icons/roomlist/dialpad.svg');
 }
diff --git a/src/components/structures/LeftPanel.tsx b/src/components/structures/LeftPanel.tsx
index eb21301738..2861cfd7e7 100644
--- a/src/components/structures/LeftPanel.tsx
+++ b/src/components/structures/LeftPanel.tsx
@@ -392,7 +392,9 @@ export default class LeftPanel extends React.Component<IProps, IState> {
                     onEnter={this.onEnter}
                 />
                 <AccessibleTooltipButton
-                    className="mx_LeftPanel_exploreButton"
+                    className={classNames("mx_LeftPanel_exploreButton", {
+                        mx_LeftPanel_exploreButton_space: !!this.state.activeSpace,
+                    })}
                     onClick={this.onExplore}
                     title={_t("Explore rooms")}
                 />
diff --git a/src/components/views/spaces/SpaceTreeLevel.tsx b/src/components/views/spaces/SpaceTreeLevel.tsx
index 1da6720eea..ca6f90fa91 100644
--- a/src/components/views/spaces/SpaceTreeLevel.tsx
+++ b/src/components/views/spaces/SpaceTreeLevel.tsx
@@ -258,7 +258,7 @@ export class SpaceItem extends React.PureComponent<IItemProps, IItemState> {
                         onClick={this.onNewRoomClick}
                     />
                     <IconizedContextMenuOption
-                        iconClassName="mx_SpacePanel_iconPlus"
+                        iconClassName="mx_SpacePanel_iconHash"
                         label={_t("Add existing room")}
                         onClick={this.onAddExistingRoomClick}
                     />

From 62172ba43d633b950b5f6a093ca41e4fb1a104d8 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 24 Mar 2021 19:43:42 +0000
Subject: [PATCH 414/420] i18n

---
 src/i18n/strings/en_EN.json | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 5f1003bf29..ba44586d79 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1011,11 +1011,12 @@
     "Share invite link": "Share invite link",
     "Invite people": "Invite people",
     "Invite with email or username": "Invite with email or username",
-    "Invite members": "Invite members",
+    "Invite to %(spaceName)s": "Invite to %(spaceName)s",
     "Share your public space": "Share your public space",
     "Settings": "Settings",
     "Leave space": "Leave space",
-    "New room": "New room",
+    "Create new room": "Create new room",
+    "Add existing room": "Add existing room",
     "Space Home": "Space Home",
     "Members": "Members",
     "Explore rooms": "Explore rooms",
@@ -1478,6 +1479,7 @@
     "<a>Add a topic</a> to help people know what it is about.": "<a>Add a topic</a> to help people know what it is about.",
     "You created this room.": "You created this room.",
     "%(displayName)s created this room.": "%(displayName)s created this room.",
+    "Invite to just this room": "Invite to just this room",
     "Add a photo, so people can easily spot your room.": "Add a photo, so people can easily spot your room.",
     "This is the start of <roomName/>.": "This is the start of <roomName/>.",
     "No pinned messages.": "No pinned messages.",
@@ -1524,11 +1526,8 @@
     "Start chat": "Start chat",
     "Rooms": "Rooms",
     "Add room": "Add room",
-    "Create new room": "Create new room",
     "You do not have permissions to create new rooms in this space": "You do not have permissions to create new rooms in this space",
-    "Add existing room": "Add existing room",
     "You do not have permissions to add rooms to this space": "You do not have permissions to add rooms to this space",
-    "Explore space rooms": "Explore space rooms",
     "Explore community rooms": "Explore community rooms",
     "Explore public rooms": "Explore public rooms",
     "Low priority": "Low priority",
@@ -1540,6 +1539,7 @@
     "Can't see what you’re looking for?": "Can't see what you’re looking for?",
     "Start a new chat": "Start a new chat",
     "Explore all public rooms": "Explore all public rooms",
+    "Quick actions": "Quick actions",
     "Use the + to make a new room or explore existing ones below": "Use the + to make a new room or explore existing ones below",
     "%(count)s results|other": "%(count)s results",
     "%(count)s results|one": "%(count)s result",
@@ -2001,14 +2001,13 @@
     "%(networkName)s rooms": "%(networkName)s rooms",
     "Matrix rooms": "Matrix rooms",
     "Space selection": "Space selection",
-    "Add existing spaces/rooms": "Add existing spaces/rooms",
+    "Add existing rooms": "Add existing rooms",
     "Filter your rooms and spaces": "Filter your rooms and spaces",
     "Spaces": "Spaces",
     "Don't want to add an existing room?": "Don't want to add an existing room?",
     "Create a new room": "Create a new room",
-    "Applying...": "Applying...",
-    "Apply": "Apply",
     "Failed to add rooms to space": "Failed to add rooms to space",
+    "Adding...": "Adding...",
     "Matrix ID": "Matrix ID",
     "Matrix Room ID": "Matrix Room ID",
     "email address": "email address",
@@ -2200,7 +2199,6 @@
     "Start a conversation with someone using their name or username (like <userId/>).": "Start a conversation with someone using their name or username (like <userId/>).",
     "This won't invite them to %(communityName)s. To invite someone to %(communityName)s, click <a>here</a>": "This won't invite them to %(communityName)s. To invite someone to %(communityName)s, click <a>here</a>",
     "Go": "Go",
-    "Invite to %(spaceName)s": "Invite to %(spaceName)s",
     "Unnamed Space": "Unnamed Space",
     "Invite to %(roomName)s": "Invite to %(roomName)s",
     "Invite someone using their name, email address, username (like <userId/>) or <a>share this space</a>.": "Invite someone using their name, email address, username (like <userId/>) or <a>share this space</a>.",

From a61f4c1811c266afacd18434cc628ffb1f986f82 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 24 Mar 2021 19:58:35 +0000
Subject: [PATCH 415/420] Auto-select space if joined whilst being viewed

---
 src/stores/SpaceStore.tsx | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/stores/SpaceStore.tsx b/src/stores/SpaceStore.tsx
index e4b537169e..bcf95a82be 100644
--- a/src/stores/SpaceStore.tsx
+++ b/src/stores/SpaceStore.tsx
@@ -34,6 +34,7 @@ import {setHasDiff} from "../utils/sets";
 import {objectDiff} from "../utils/objects";
 import {arrayHasDiff} from "../utils/arrays";
 import {ISpaceSummaryEvent, ISpaceSummaryRoom} from "../components/structures/SpaceRoomDirectory";
+import RoomViewStore from "./RoomViewStore";
 
 type SpaceKey = string | symbol;
 
@@ -368,6 +369,11 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
             this.onRoomsUpdate();
         }
 
+        // if the user was looking at the room and then joined select that space
+        if (room.getMyMembership() === "join" && room.roomId === RoomViewStore.getRoomId()) {
+            this.setActiveSpace(room);
+        }
+
         const numSuggestedRooms = this._suggestedRooms.length;
         this._suggestedRooms = this._suggestedRooms.filter(r => r.room_id !== room.roomId);
         if (numSuggestedRooms !== this._suggestedRooms.length) {

From d705e3020f2636a776fff53226b392927837b888 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 24 Mar 2021 20:01:27 +0000
Subject: [PATCH 416/420] delint

---
 src/components/structures/SpaceRoomView.tsx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/structures/SpaceRoomView.tsx b/src/components/structures/SpaceRoomView.tsx
index 3ef10363b9..cea59093ac 100644
--- a/src/components/structures/SpaceRoomView.tsx
+++ b/src/components/structures/SpaceRoomView.tsx
@@ -46,9 +46,7 @@ import {SetRightPanelPhasePayload} from "../../dispatcher/payloads/SetRightPanel
 import {useStateArray} from "../../hooks/useStateArray";
 import SpacePublicShare from "../views/spaces/SpacePublicShare";
 import {showAddExistingRooms, showCreateNewRoom, shouldShowSpaceSettings, showSpaceSettings} from "../../utils/space";
-import {HierarchyLevel, ISpaceSummaryEvent, ISpaceSummaryRoom, showRoom, useSpaceSummary} from "./SpaceRoomDirectory";
-import {useAsyncMemo} from "../../hooks/useAsyncMemo";
-import {EnhancedMap} from "../../utils/maps";
+import {HierarchyLevel, ISpaceSummaryRoom, showRoom, useSpaceSummary} from "./SpaceRoomDirectory";
 import AutoHideScrollbar from "./AutoHideScrollbar";
 import MemberAvatar from "../views/avatars/MemberAvatar";
 import {useStateToggle} from "../../hooks/useStateToggle";

From d3cdd38ff4d734e062a9d822425688526d756b5b Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 24 Mar 2021 20:11:23 +0000
Subject: [PATCH 417/420] delint some more

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

diff --git a/src/components/views/rooms/RoomList.tsx b/src/components/views/rooms/RoomList.tsx
index d7fbe0b4df..e83b07f71b 100644
--- a/src/components/views/rooms/RoomList.tsx
+++ b/src/components/views/rooms/RoomList.tsx
@@ -49,7 +49,7 @@ import { IconizedContextMenuOption, IconizedContextMenuOptionList } from "../con
 import AccessibleButton from "../elements/AccessibleButton";
 import { CommunityPrototypeStore } from "../../../stores/CommunityPrototypeStore";
 import CallHandler from "../../../CallHandler";
-import SpaceStore, {SUGGESTED_ROOMS, UPDATE_SELECTED_SPACE} from "../../../stores/SpaceStore";
+import SpaceStore, {SUGGESTED_ROOMS} from "../../../stores/SpaceStore";
 import { showAddExistingRooms, showCreateNewRoom } from "../../../utils/space";
 import {replaceableComponent} from "../../../utils/replaceableComponent";
 import RoomAvatar from "../avatars/RoomAvatar";

From 510f08e9f1c923a0dfe3b1fd73ab1fc92af2a772 Mon Sep 17 00:00:00 2001
From: Germain Souquet <germain@souquet.com>
Date: Thu, 25 Mar 2021 10:11:52 +0000
Subject: [PATCH 418/420] Update failed invites copy

---
 src/components/views/dialogs/InviteDialog.tsx | 2 +-
 src/i18n/strings/en_EN.json                   | 2 +-
 src/utils/MultiInviter.js                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/views/dialogs/InviteDialog.tsx b/src/components/views/dialogs/InviteDialog.tsx
index 4ea53349bd..8ad262cff9 100644
--- a/src/components/views/dialogs/InviteDialog.tsx
+++ b/src/components/views/dialogs/InviteDialog.tsx
@@ -673,7 +673,7 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
             console.error(err);
             this.setState({
                 busy: false,
-                errorText: _t("We couldn't create your DM. Please check the users you want to invite and try again."),
+                errorText: _t("We couldn't create your DM."),
             });
         });
     };
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 5f1003bf29..5bb8ff33fd 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2184,7 +2184,7 @@
     "Click the button below to confirm your identity.": "Click the button below to confirm your identity.",
     "Invite by email": "Invite by email",
     "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.",
+    "We couldn't create your DM.": "We couldn't create your DM.",
     "Something went wrong trying to invite the users.": "Something went wrong trying to invite the users.",
     "We couldn't invite those users. Please check the users you want to invite and try again.": "We couldn't invite those users. Please check the users you want to invite and try again.",
     "A call can only be transferred to a single user.": "A call can only be transferred to a single user.",
diff --git a/src/utils/MultiInviter.js b/src/utils/MultiInviter.js
index 3d3a5f4137..78f956b91b 100644
--- a/src/utils/MultiInviter.js
+++ b/src/utils/MultiInviter.js
@@ -221,7 +221,7 @@ export default class MultiInviter {
 
                     const AskInviteAnywayDialog = sdk.getComponent("dialogs.AskInviteAnywayDialog");
                     console.log("Showing failed to invite dialog...");
-                    Modal.createTrackedDialog('Failed to invite the following users to the room', '', AskInviteAnywayDialog, {
+                    Modal.createTrackedDialog('Failed to invite', '', AskInviteAnywayDialog, {
                         unknownProfileUsers: unknownProfileUsers.map(u => {return {userId: u, errorText: this.errors[u].errorText};}),
                         onInviteAnyways: () => inviteUnknowns(),
                         onGiveUp: () => {

From 97c7f3753bf86cce373d5cb3624f488c329f39b0 Mon Sep 17 00:00:00 2001
From: Panagiotis <27917356+panoschal@users.noreply.github.com>
Date: Thu, 25 Mar 2021 20:58:39 +0200
Subject: [PATCH 419/420] fix: save editor state when reply is open

---
 src/components/views/rooms/SendMessageComposer.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/components/views/rooms/SendMessageComposer.js b/src/components/views/rooms/SendMessageComposer.js
index 51899a0e45..aca2066d34 100644
--- a/src/components/views/rooms/SendMessageComposer.js
+++ b/src/components/views/rooms/SendMessageComposer.js
@@ -472,12 +472,17 @@ export default class SendMessageComposer extends React.Component {
         }
     }
 
+    // should save state when editor has contents or reply is open
+    _shouldSaveStoredEditorState = () => {
+        return !this.model.isEmpty || this.props.replyToEvent;
+    }
+
     _saveStoredEditorState = () => {
-        if (this.model.isEmpty) {
-            this._clearStoredEditorState();
-        } else {
+        if (this._shouldSaveStoredEditorState()) {
             const item = SendHistoryManager.createItem(this.model, this.props.replyToEvent);
             localStorage.setItem(this._editorStateKey, JSON.stringify(item));
+        } else {
+            this._clearStoredEditorState();
         }
     }
 

From 5e3a7c48f4a006e731e54bdddfc83004c665e482 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 25 Mar 2021 19:37:55 +0000
Subject: [PATCH 420/420] Fix edge case with redaction grouper messing up
 continuations

---
 src/components/structures/MessagePanel.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 6d03c849c4..41a3015721 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -46,6 +46,9 @@ function shouldFormContinuation(prevEvent, mxEvent) {
     // check if within the max continuation period
     if (mxEvent.getTs() - prevEvent.getTs() > CONTINUATION_MAX_INTERVAL) return false;
 
+    // As we summarise redactions, do not continue a redacted event onto a non-redacted one and vice-versa
+    if (mxEvent.isRedacted() !== prevEvent.isRedacted()) return false;
+
     // Some events should appear as continuations from previous events of different types.
     if (mxEvent.getType() !== prevEvent.getType() &&
         (!continuedTypes.includes(mxEvent.getType()) ||
@@ -1125,7 +1128,7 @@ class RedactionGrouper {
     }
 
     getNewPrevEvent() {
-        return this.events[0];
+        return this.events[this.events.length - 1];
     }
 }